Skip to content

Commit 9809622

Browse files
authored
Migrated actions/download-artifact and actions/upload-artifact from v3 to v4. (#235)
* Bump up github action versions * Added job in wheels.yml to merge all the wheels
1 parent 0f41c44 commit 9809622

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

.github/workflows/generate_third_party_licenses.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Generate NOTICE_DEFAULT file
3636
id: ort-action
3737
# https://github.com/oss-review-toolkit/ort-ci-github-action/issues/28
38-
uses: oss-review-toolkit/ort-ci-github-action@7f23c1f8d169dad430e41df223d3b8409c7a156e
38+
uses: oss-review-toolkit/ort-ci-github-action@81698a977ebcf51bb3d6ef5c6a04220cf60d3bde
3939
with:
4040
ort-cli-report-args: -f PlainTextTemplate
4141
run: >

.github/workflows/wheels.yml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@ jobs:
5959
role-to-assume: ${{ vars.ACTIONS_IAM_ROLE }}
6060
aws-region: ${{ vars.S3_REGION }}
6161

62-
# Downloading artifacts that were created from action/upload-artifact@v3 and below are not supported.
63-
# https://github.com/actions/download-artifact
64-
# These actions should remain @v3 for now, ignore dependabot proposed upgrade.
65-
# https://github.com/actions/upload-artifact/issues/478
66-
- uses: actions/download-artifact@v3
62+
- uses: actions/download-artifact@v4
6763
with:
6864
name: ${{ needs.generate_third_party_licenses.outputs.artifact_name }}
6965

@@ -106,10 +102,10 @@ jobs:
106102
2>&1
107103
shell: bash
108104
109-
- uses: actions/upload-artifact@v3
105+
- uses: actions/upload-artifact@v4
110106
with:
111107
path: "./wheelhouse/*.whl"
112-
name: wheels
108+
name: wheels-${{ matrix.python }}-${{ matrix.builder.kind }}_${{ matrix.builder.arch }}
113109

114110
build_source_wheels:
115111
name: Build source wheels for ${{ matrix.build_target }}
@@ -124,7 +120,7 @@ jobs:
124120
steps:
125121
- uses: actions/checkout@v4
126122

127-
- uses: actions/download-artifact@v3
123+
- uses: actions/download-artifact@v4
128124
with:
129125
name: ${{ needs.generate_third_party_licenses.outputs.artifact_name }}
130126

@@ -141,7 +137,19 @@ jobs:
141137
python -m pip install build
142138
python -m build --sdist
143139
144-
- uses: actions/upload-artifact@v3
140+
- uses: actions/upload-artifact@v4
145141
with:
146142
path: "./${{ matrix.build_target }}/dist/*"
147-
name: wheels
143+
name: wheels-${{ matrix.build_target }}
144+
merge:
145+
name: Merge the wheels
146+
runs-on: ubuntu-latest
147+
needs:
148+
- build_wheels
149+
- build_source_wheels
150+
steps:
151+
- name: Merge Artifacts
152+
uses: actions/upload-artifact/merge@v4
153+
with:
154+
name: wheels
155+
pattern: wheels-*

0 commit comments

Comments
 (0)