Migrate to new artifact action API

Signed-off-by: Keith Battocchi <[email protected]>

Author: kbattocchi

.github/workflows/ci.yml

@@ -155,9 +155,9 @@ jobs:
     - name: Save installed packages
       run: pip freeze --exclude-editable > notebooks-${{ env.id_string }}-requirements.txt
     - name: Upload installed packages
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: requirements
+        name: requirements-${{ env.id_string }}
         path: notebooks-${{ env.id_string }}-requirements.txt
     - name: Install pytest
       run: uv pip install --system pytest pytest-xdist pytest-cov coverage[toml]
@@ -173,26 +173,26 @@ jobs:
       # Run whether or not the tests passed, but only if they ran at all
       if: success() || failure() && contains(fromJSON('["success", "failure"]'), steps.run_tests.outcome)
     - name: Upload coverage report
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: success() || failure() && contains(fromJSON('["success", "failure"]'), steps.run_tests.outcome)
       with:
-        name: coverage
+        name: coverage-${{ env.id_string }}
         path: .coverage.${{ env.id_string }}    
     - name: Make test XML filename unique
       run: mv junit/test-results.xml ${{ env.id_string }}-test-results.xml
       # Run whether or not the tests passed, but only if they ran at all
       if: success() || failure() && contains(fromJSON('["success", "failure"]'), steps.run_tests.outcome)
     - name: Upload test XML files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: success() || failure() && contains(fromJSON('["success", "failure"]'), steps.run_tests.outcome)
       with:
-        name: tests
+        name: tests-${{ env.id_string }}
         path: ${{ env.id_string }}-test-results.xml
     - name: Upload notebook outputs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: success() || failure() && contains(fromJSON('["success", "failure"]'), steps.run_tests.outcome)
       with:
-        name: notebooks
+        name: notebooks-${{ env.id_string }}
         path: notebooks/output/
 
   tests:
@@ -256,9 +256,9 @@ jobs:
     - name: Save installed packages
       run: pip freeze --exclude-editable > tests-${{ env.id_string }}-requirements.txt
     - name: Upload installed packages
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: requirements
+        name: requirements-${{ env.id_string }}
         path: tests-${{ env.id_string }}-requirements.txt
     - name: Install pytest
       run: uv pip install --system pytest pytest-xdist pytest-cov coverage[toml]
@@ -273,20 +273,20 @@ jobs:
       # Run whether or not the tests passed, but only if they ran at all
       if: success() || failure() && contains(fromJSON('["success", "failure"]'), steps.run_tests.outcome)
     - name: Upload coverage report
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: success() || failure() && contains(fromJSON('["success", "failure"]'), steps.run_tests.outcome)
       with:
-        name: coverage
+        name: coverage-${{ env.id_string }}
         path: .coverage.${{ env.id_string }}
     - name: Make test XML filename unique
       run: mv junit/test-results.xml ${{ env.id_string }}-test-results.xml
       # Run whether or not the tests passed, but only if they ran at all
       if: success() || failure() && contains(fromJSON('["success", "failure"]'), steps.run_tests.outcome)
     - name: Upload test XML files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: success() || failure() && contains(fromJSON('["success", "failure"]'), steps.run_tests.outcome)
       with:
-        name: tests
+        name: tests-${{ env.id_string }}
         path: ${{ env.id_string }}-test-results.xml
 
   coverage-report:
@@ -300,10 +300,11 @@ jobs:
       with:
         ref: ${{ env.ref }}
     - name: Get coverage reports
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
-        name: coverage
+        pattern: coverage-*
         path: coverage
+        merge-multiple: true
     - name: Setup Python
       uses: actions/setup-python@v5
       with:
@@ -317,11 +318,27 @@ jobs:
     - name: Generate coverage html --fail-under=86
       run: coverage html
     - name: Upload coverage report
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: coverage
+        name: coverage-report
         path: htmlcov
 
+  merge-artifacts:
+    name: "Merge artifacts"
+    needs: [coverage-report, tests, notebooks]
+    if: success() || failure()
+    strategy:
+      matrix:
+        artifact: [requirements, tests, coverage, notebooks]
+    runs-on: ubuntu-latest
+    steps:
+    - name: "Merge artifacts"
+      uses: actions/upload-artifact/merge@v4
+      with:
+        name: ${{ matrix.artifact }}
+        pattern: "${{ matrix.artifact }}-*"
+        delete-merged: true
+      
   build:
     name: Build package
     needs: [eval]

.github/workflows/publish-documentation.yml

@@ -81,7 +81,7 @@ jobs:
       - name: Build documentation
         run: pip install "sphinx~=4.4.0" "sphinx_rtd_theme~=1.0.0" && python setup.py build_sphinx -W
       - name: Upload docs as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docs
           path: build/sphinx/html/
@@ -108,7 +108,7 @@ jobs:
           zip -r docs.zip *
           popd
       - name: Login to Azure
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}

.github/workflows/publish-package.yml

@@ -74,9 +74,9 @@ jobs:
           CIBW_BUILD: cp3*
           CIBW_SKIP: "*musl* *win32 *i686"
       - name: Upload wheels as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: dist
+          name: dist-${{ matrix.os }}
           path: dist/
   build_sdist:
     name: Build sdist
@@ -97,13 +97,26 @@ jobs:
       - name: Build sdist
         run: python setup.py sdist
       - name: Upload sdist as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: dist
+          name: dist-sdist
           path: dist/
+
+  merge:
+    name: Merge artifacts
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Merge artifacts"
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: dist
+          pattern: dist-*
+          delete-merged: true
+
   publish:
     name: Publish to PyPI or TestPyPI
-    needs: [build_wheels, build_sdist]
+    needs: [merge]
     runs-on: ubuntu-latest
     steps:
       - name: Setup Python
@@ -115,7 +128,7 @@ jobs:
       - name: Install twine
         run: pip install twine
       - name: Download wheels and sdist
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: dist
           path: dist/