Merge pull request #163 from knutfrode/dev

Sphinx build -> needs: build

Author: knutfrode

.github/workflows/python.yml

@@ -20,8 +20,8 @@ jobs:
         os: ["ubuntu", "macos", "windows"]
         python-version: [ '3.9', '3.10', '3.11' ]
     steps:
-      - uses: actions/checkout@v3
-      - uses: mamba-org/setup-micromamba@v1
+      - uses: actions/checkout@v4
+      - uses: mamba-org/setup-micromamba@v2
         with:
           environment-file: environment.yml
           channels: conda-forge
@@ -35,7 +35,7 @@ jobs:
 
       - name: Cache cartopy maps
         id: cache-cartopy
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.local/share/cartopy
           key: cartopy-maps

.github/workflows/sphinx-rtd.yml

@@ -29,9 +29,9 @@ jobs:
         shell: bash -l {0}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - uses: mamba-org/setup-micromamba@v1
+      - uses: mamba-org/setup-micromamba@v2
         with:
           environment-file: environment.yml
           channels: conda-forge
@@ -64,9 +64,8 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v4
         with:
-          name: my-artifact-${{ matrix.runs-on }}
+          name: docs
           path: ./docs/build/html
-          overwrite: true
 
   # Deployment job
   deploy:
@@ -80,13 +79,3 @@ jobs:
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4
-
-  merge:
-    runs-on: ubuntu-latest
-    needs: upload
-    steps:
-      - name: Merge Artifacts
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: all-my-files
-          pattern: my-artifact-*