Migrated actions/download-artifact and actions/upload-artifact from v…

…3 to v4. (#235) * Bump up github action versions * Added job in wheels.yml to merge all the wheels
awslabs · Sep 18, 2024 · 9809622 · 9809622
1 parent 0f41c44
commit 9809622
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/generate_third_party_licenses.yml b/.github/workflows/generate_third_party_licenses.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Generate NOTICE_DEFAULT file
         id: ort-action
         # https://github.com/oss-review-toolkit/ort-ci-github-action/issues/28
-        uses: oss-review-toolkit/ort-ci-github-action@7f23c1f8d169dad430e41df223d3b8409c7a156e
+        uses: oss-review-toolkit/ort-ci-github-action@81698a977ebcf51bb3d6ef5c6a04220cf60d3bde
         with:
           ort-cli-report-args: -f PlainTextTemplate
           run: >

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -59,11 +59,7 @@ jobs:
           role-to-assume: ${{ vars.ACTIONS_IAM_ROLE }}
           aws-region: ${{ vars.S3_REGION }}
 
-      # Downloading artifacts that were created from action/upload-artifact@v3 and below are not supported.
-      # https://github.com/actions/download-artifact
-      # These actions should remain @v3 for now, ignore dependabot proposed upgrade.
-      # https://github.com/actions/upload-artifact/issues/478
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ needs.generate_third_party_licenses.outputs.artifact_name }}
 
@@ -106,10 +102,10 @@ jobs:
           2>&1
         shell: bash
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: "./wheelhouse/*.whl"
-          name: wheels
+          name: wheels-${{ matrix.python }}-${{ matrix.builder.kind }}_${{ matrix.builder.arch }}
 
   build_source_wheels:
     name: Build source wheels for ${{ matrix.build_target }}
@@ -124,7 +120,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ needs.generate_third_party_licenses.outputs.artifact_name }}
 
@@ -141,7 +137,19 @@ jobs:
           python -m pip install build
           python -m build --sdist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: "./${{ matrix.build_target }}/dist/*"
-          name: wheels
+          name: wheels-${{ matrix.build_target }}
+  merge:
+    name: Merge the wheels
+    runs-on: ubuntu-latest
+    needs:
+      - build_wheels
+      - build_source_wheels
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+           name: wheels
+           pattern: wheels-*