From e835078065e4728aaae1c88323b40a7d495146c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 21:21:17 +0000 Subject: [PATCH 1/2] chore(deps): bump the actions group with 5 updates Bumps the actions group with 5 updates: | Package | From | To | | --- | --- | --- | | [conda-incubator/setup-miniconda](https://github.com/conda-incubator/setup-miniconda) | `3.0.1` | `3.0.3` | | [pre-commit/action](https://github.com/pre-commit/action) | `3.0.0` | `3.0.1` | | [actions/upload-artifact](https://github.com/actions/upload-artifact) | `3` | `4` | | [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) | `2.16` | `2.17` | | [actions/download-artifact](https://github.com/actions/download-artifact) | `3` | `4` | Updates `conda-incubator/setup-miniconda` from 3.0.1 to 3.0.3 - [Release notes](https://github.com/conda-incubator/setup-miniconda/releases) - [Changelog](https://github.com/conda-incubator/setup-miniconda/blob/main/CHANGELOG.md) - [Commits](https://github.com/conda-incubator/setup-miniconda/compare/v3.0.1...v3.0.3) Updates `pre-commit/action` from 3.0.0 to 3.0.1 - [Release notes](https://github.com/pre-commit/action/releases) - [Commits](https://github.com/pre-commit/action/compare/v3.0.0...v3.0.1) 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 `pypa/cibuildwheel` from 2.16 to 2.17 - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.16...v2.17) 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: conda-incubator/setup-miniconda dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions - dependency-name: pre-commit/action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-minor 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/conda.yml | 2 +- .github/workflows/format.yml | 2 +- .github/workflows/wheels.yml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index 7b1e70b..873567a 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -28,7 +28,7 @@ jobs: submodules: true - name: Get conda - uses: conda-incubator/setup-miniconda@v3.0.1 + uses: conda-incubator/setup-miniconda@v3.0.3 with: python-version: ${{ matrix.python-version }} channels: conda-forge diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 5da8730..687854b 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -19,4 +19,4 @@ jobs: - uses: actions/setup-python@v5 with: python-version: "3.x" - - uses: pre-commit/action@v3.0.0 + - uses: pre-commit/action@v3.0.1 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 8155de2..7306f32 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -25,7 +25,7 @@ jobs: - name: Check metadata run: pipx run twine check dist/* - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: dist/*.tar.gz @@ -43,7 +43,7 @@ jobs: with: submodules: true - - uses: pypa/cibuildwheel@v2.16 + - uses: pypa/cibuildwheel@v2.17 env: CIBW_ARCHS_MACOS: auto universal2 @@ -52,7 +52,7 @@ jobs: shell: bash - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: wheelhouse/*.whl @@ -68,7 +68,7 @@ jobs: with: python-version: "3.x" - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: dist From 9724df93d2111527c508d4f6d0a522cf3b176192 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 19 Mar 2024 15:45:02 -0400 Subject: [PATCH 2/2] ci: fix artifact naming Signed-off-by: Henry Schreiner --- .github/workflows/wheels.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 7306f32..6ccd403 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -27,6 +27,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: cibw-sdist path: dist/*.tar.gz @@ -54,6 +55,7 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: + name: cibw-wheels-${{ matrix.os }} path: wheelhouse/*.whl @@ -70,8 +72,9 @@ jobs: - uses: actions/download-artifact@v4 with: - name: artifact + pattern: cibw-* path: dist + merge-multiple: true - uses: pypa/gh-action-pypi-publish@release/v1 with: