From 80b3bcab30848afc256509343cb0b92149dfdfaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 19:58:06 +0000 Subject: [PATCH 1/2] chore(deps): bump the actions group with 3 updates Bumps the actions group with 3 updates: [mymindstorm/setup-emsdk](https://github.com/mymindstorm/setup-emsdk), [actions/upload-artifact](https://github.com/actions/upload-artifact) and [actions/download-artifact](https://github.com/actions/download-artifact). Updates `mymindstorm/setup-emsdk` from 13 to 14 - [Release notes](https://github.com/mymindstorm/setup-emsdk/releases) - [Commits](https://github.com/mymindstorm/setup-emsdk/compare/v13...v14) Updates `actions/upload-artifact` from 3 to 4 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) Updates `actions/download-artifact` from 3 to 4 - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: mymindstorm/setup-emsdk dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/emscripten.yaml | 4 ++-- .github/workflows/tests.yml | 2 +- .github/workflows/wheels.yml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/emscripten.yaml b/.github/workflows/emscripten.yaml index fba0e626..f6b84789 100644 --- a/.github/workflows/emscripten.yaml +++ b/.github/workflows/emscripten.yaml @@ -40,7 +40,7 @@ jobs: EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version) echo "emsdk-version=$EMSCRIPTEN_VERSION" >> $GITHUB_OUTPUT - - uses: mymindstorm/setup-emsdk@v13 + - uses: mymindstorm/setup-emsdk@v14 with: version: ${{ steps.compute-emsdk-version.outputs.emsdk-version }} actions-cache-folder: emsdk-cache @@ -61,6 +61,6 @@ jobs: run: .venv-pyodide/bin/pytest - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: dist/*.whl diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 90f4cc02..8fb4329c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -112,7 +112,7 @@ jobs: CIBW_BUILD_VERBOSITY: 1 CIBW_ENVIRONMENT: "PIP_ONLY_BINARY=:all:" - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: wheelhouse/* diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 7721a69d..2be3b433 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -45,7 +45,7 @@ jobs: - name: Check metadata run: pipx run twine check --strict dist/* - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: dist/*.tar.gz @@ -81,7 +81,7 @@ jobs: shell: bash - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: wheelhouse/*.whl @@ -122,7 +122,7 @@ jobs: shell: bash - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: wheelhouse/*.whl @@ -132,7 +132,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: dist From 63559d68e4df2e70adff9b61f20e360c19e2f97c Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 1 Feb 2024 18:02:25 -0500 Subject: [PATCH 2/2] ci: use multiple artifact names Signed-off-by: Henry Schreiner --- .github/workflows/emscripten.yaml | 1 + .github/workflows/tests.yml | 1 + .github/workflows/wheels.yml | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/emscripten.yaml b/.github/workflows/emscripten.yaml index f6b84789..ee9b518d 100644 --- a/.github/workflows/emscripten.yaml +++ b/.github/workflows/emscripten.yaml @@ -63,4 +63,5 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: + name: emscripten-wheel path: dist/*.whl diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8fb4329c..0b0343d1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -115,6 +115,7 @@ jobs: - uses: actions/upload-artifact@v4 with: path: wheelhouse/* + name: test-wheels-${{ strategy.job-index }} - name: Check wheels run: pipx run twine check wheelhouse/* diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 2be3b433..0436b2c2 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -48,6 +48,7 @@ jobs: - uses: actions/upload-artifact@v4 with: path: dist/*.tar.gz + name: wheels-sdist build_arch_wheels: name: ${{ matrix.python }} on ${{ matrix.arch }} @@ -84,6 +85,7 @@ jobs: uses: actions/upload-artifact@v4 with: path: wheelhouse/*.whl + name: wheel-aarch-${{ strategy.job-index }} build_wheels: name: ${{ matrix.type }} ${{ matrix.arch }} on ${{ matrix.os }} @@ -125,6 +127,7 @@ jobs: uses: actions/upload-artifact@v4 with: path: wheelhouse/*.whl + name: wheels-${{ strategy.job-index }} upload_all: name: Upload if release @@ -134,7 +137,8 @@ jobs: steps: - uses: actions/download-artifact@v4 with: - name: artifact + pattern: wheels-* + merge-multiple: true path: dist - name: List all files