Merge branch 'main' into landsurfacetemp

Author: vers-w

.dvc/.gitignore

@@ -0,0 +1,3 @@
+/config.local
+/tmp
+/cache

.dvc/config

@@ -0,0 +1,11 @@
+[core]
+    remote = wflow-testdata-ro
+['remote "wflow-testdata-ro"']
+    url = s3://wflow/testdata
+    endpointurl = https://s3.deltares.nl/
+    allow_anonymous_login = true
+    region = eu-west-1
+['remote "wflow-testdata-rw"']
+    url = s3://wflow/testdata
+    endpointurl = https://s3.deltares.nl/
+    region = eu-west-1

.dvcignore

@@ -0,0 +1,3 @@
+# Add patterns of files dvc should ignore, which could improve
+# the performance. Learn more at
+# https://dvc.org/doc/user-guide/dvcignore

.github/ISSUE_TEMPLATE/documentation.yaml

@@ -10,7 +10,7 @@ body:
       options:
         - label: >
             I have checked that the issue still exists on the latest versions of the docs
-            on `master` [here](https://github.com/Deltares/Wflow.jl)
+            on `main` [here](https://github.com/Deltares/Wflow.jl)
           required: true
   - type: dropdown
     id: kind

.github/pull_request_template.md

@@ -6,7 +6,7 @@ Explain how you addressed the bug/feature request, what choices you made and why
 
 ## Checklist
 - [ ] Updated tests or added new tests
-- [ ] Branch is up to date with `master`
+- [ ] Branch is up to date with `main`
 - [ ] Tests & prek hooks pass
 - [ ] Updated documentation if needed
 - [ ] Updated changelog.qmd if needed

.github/workflows/CI.yml

@@ -3,8 +3,8 @@ on:
   pull_request:
   push:
     branches:
-      - master
-      - v1
+      - main
+      - release/v1.0
     tags: '*'
 
 # needed to allow julia-actions/cache to delete old caches that it has created
@@ -29,12 +29,10 @@ jobs:
           - '2'
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - uses: julia-actions/cache@a45e8fa8be21c18a06b7177052533149e61e9b38 # v3.1.0
-      - uses: prefix-dev/setup-pixi@a09b6247153796b190642a2b53fac4241043cf6f # v0.10.0
+      - uses: julia-actions/cache@a7bed9df697e5d7309d68afe7542a87621a8b6c8 # v3.3.0
+      - uses: prefix-dev/setup-pixi@f00437f565399d418b0acc85936d12c1fb668347 # v0.10.1
         with:
           pixi-version: "latest"
-      - name: Prepare pixi
-        run: pixi run install-julia
       - name: Test Wflow
         run: |
           pixi run test-wflow-cov

.github/workflows/CIWflowServer.yml

@@ -3,8 +3,8 @@ on:
   pull_request:
   push:
     branches:
-      - master
-      - v1
+      - main
+      - release/v1.0
     tags: '*'
 
 # needed to allow julia-actions/cache to delete old caches that it has created
@@ -26,12 +26,10 @@ jobs:
           - x64
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - uses: julia-actions/cache@a45e8fa8be21c18a06b7177052533149e61e9b38 # v3.1.0
-      - uses: prefix-dev/setup-pixi@a09b6247153796b190642a2b53fac4241043cf6f # v0.10.0
+      - uses: julia-actions/cache@a7bed9df697e5d7309d68afe7542a87621a8b6c8 # v3.3.0
+      - uses: prefix-dev/setup-pixi@f00437f565399d418b0acc85936d12c1fb668347 # v0.10.1
         with:
           pixi-version: "latest"
-      - name: Prepare pixi
-        run: pixi run install-julia
       - name: Test WflowServer
         run: |
           pixi run test-wflow-server

.github/workflows/TagBot.yml

@@ -9,7 +9,7 @@ jobs:
     if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
     runs-on: ubuntu-latest
     steps:
-      - uses: JuliaRegistries/TagBot@14d7645453716d7a2f09b1da0504a024f97462a1 # v1.25.10
+      - uses: JuliaRegistries/TagBot@cded32665b34ca0496d3ac10a67d08ddfc726963 # v1.25.11
         with:
           token: ${{ secrets.CI_PR_PAT }}
           ssh: ${{ secrets.DOCUMENTER_KEY }}

.github/workflows/docs.yml

@@ -1,7 +1,7 @@
 name: Quarto documentation
 on:
   push:
-    branches: [master]
+    branches: [main, release/v1.0]
     tags: [v*]
   pull_request:
 
@@ -22,12 +22,12 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - uses: julia-actions/cache@a45e8fa8be21c18a06b7177052533149e61e9b38 # v3.1.0
-      - uses: prefix-dev/setup-pixi@a09b6247153796b190642a2b53fac4241043cf6f # v0.10.0
+      - uses: julia-actions/cache@a7bed9df697e5d7309d68afe7542a87621a8b6c8 # v3.3.0
+      - uses: prefix-dev/setup-pixi@f00437f565399d418b0acc85936d12c1fb668347 # v0.10.1
         with:
           pixi-version: "latest"
-      - name: Prepare pixi
-        run: pixi run install-ci
+      - name: Instantiate Julia project
+        run: pixi run instantiate-julia docs
 
       - name: Check Quarto installation and all engines
         run: pixi run quarto-check
@@ -46,7 +46,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish Quarto Project as dev
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4.1.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -55,6 +55,16 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Publish Quarto Project as v1.0
+        if: github.event_name == 'push' && github.ref == 'refs/heads/release/v1.0'
+        uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4.1.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs/_site
+          destination_dir: v1.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Publish Quarto Project as version
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
         uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4.1.0

.github/workflows/julia-auto-update.yml

@@ -12,14 +12,11 @@ jobs:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-      - uses: prefix-dev/setup-pixi@a09b6247153796b190642a2b53fac4241043cf6f # v0.10.0
+      - uses: prefix-dev/setup-pixi@f00437f565399d418b0acc85936d12c1fb668347 # v0.10.1
         with:
           pixi-version: "latest"
       - name: Update Julia manifest
-        run: |
-          pixi run install-julia
-          pixi run update-registry-julia
-          pixi run update-manifest-julia
+        run: pixi run update-manifest-julia
         env:
           JULIA_PKG_PRECOMPILE_AUTO: "0"
       - uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1