From a295ed7651ac86b716ef0b137bc2c091a609545a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 22:43:06 +0000 Subject: [PATCH 1/4] Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4.1.7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/tests+artifacts+pypi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests+artifacts+pypi.yml b/.github/workflows/tests+artifacts+pypi.yml index ceb0abd23..5bf33dd80 100644 --- a/.github/workflows/tests+artifacts+pypi.yml +++ b/.github/workflows/tests+artifacts+pypi.yml @@ -329,7 +329,7 @@ jobs: echo "PIP_INSTALL_ARGS=--break-system-packages" >> $GITHUB_ENV # Python 3.12 workaround python -m pip install --break-system-packages setuptools packaging - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4.1.7 with: name: dist path: dist @@ -343,7 +343,7 @@ jobs: permissions: id-token: write steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4.1.7 with: name: dist path: dist From e5d3d60f0fa1c62ad63be7334e7cbaebf4be5f43 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Thu, 10 Oct 2024 14:35:17 +0200 Subject: [PATCH 2/4] make upload/download workflow compatible with newer actions --- .github/workflows/tests+artifacts+pypi.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests+artifacts+pypi.yml b/.github/workflows/tests+artifacts+pypi.yml index 5bf33dd80..8b88025b6 100644 --- a/.github/workflows/tests+artifacts+pypi.yml +++ b/.github/workflows/tests+artifacts+pypi.yml @@ -298,7 +298,7 @@ jobs: - uses: actions/upload-artifact@v3 with: path: ${{ matrix.packages-dir}}/dist - name: dist + name: dist-${{ matrix.packages-dir }} pkg_install_check: strategy: @@ -331,7 +331,8 @@ jobs: python -m pip install --break-system-packages setuptools packaging - uses: actions/download-artifact@v4.1.7 with: - name: dist + pattern: dist-* + merge-multiple: true path: dist - run: python -m pip install $PIP_INSTALL_ARGS dist/*.whl - run: python -c "import PySDM; print(PySDM.__version__)" @@ -345,7 +346,8 @@ jobs: steps: - uses: actions/download-artifact@v4.1.7 with: - name: dist + pattern: dist-* + merge-multiple: true path: dist - if: github.event_name == 'push' && github.ref == 'refs/heads/main' From a4c94ce9147b4a05fde0f3491cff355976c27f2f Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Thu, 10 Oct 2024 22:23:56 +0200 Subject: [PATCH 3/4] bump upload artifact version as well --- .github/workflows/tests+artifacts+pypi.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests+artifacts+pypi.yml b/.github/workflows/tests+artifacts+pypi.yml index 8b88025b6..b7584b905 100644 --- a/.github/workflows/tests+artifacts+pypi.yml +++ b/.github/workflows/tests+artifacts+pypi.yml @@ -295,9 +295,9 @@ jobs: exit `fgrep -i warning build.log | grep -v impl_numba/warnings.py | grep -v "no previously-included files matching" | wc -l` twine check --strict dist/* - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4.1.7 with: - path: ${{ matrix.packages-dir}}/dist + path: ${{ matrix.packages-dir }}/dist name: dist-${{ matrix.packages-dir }} pkg_install_check: @@ -348,7 +348,7 @@ jobs: with: pattern: dist-* merge-multiple: true - path: dist + path: dist - if: github.event_name == 'push' && github.ref == 'refs/heads/main' uses: pypa/gh-action-pypi-publish@unstable/v1 From 358e7aff336ce99feda4d7f297a235c17ff325e4 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Thu, 10 Oct 2024 23:26:19 +0200 Subject: [PATCH 4/4] make version strings less precise (just v4) --- .github/workflows/tests+artifacts+pypi.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests+artifacts+pypi.yml b/.github/workflows/tests+artifacts+pypi.yml index b7584b905..d9831e293 100644 --- a/.github/workflows/tests+artifacts+pypi.yml +++ b/.github/workflows/tests+artifacts+pypi.yml @@ -295,7 +295,7 @@ jobs: exit `fgrep -i warning build.log | grep -v impl_numba/warnings.py | grep -v "no previously-included files matching" | wc -l` twine check --strict dist/* - - uses: actions/upload-artifact@v4.1.7 + - uses: actions/upload-artifact@v4 with: path: ${{ matrix.packages-dir }}/dist name: dist-${{ matrix.packages-dir }} @@ -329,7 +329,7 @@ jobs: echo "PIP_INSTALL_ARGS=--break-system-packages" >> $GITHUB_ENV # Python 3.12 workaround python -m pip install --break-system-packages setuptools packaging - - uses: actions/download-artifact@v4.1.7 + - uses: actions/download-artifact@v4 with: pattern: dist-* merge-multiple: true @@ -344,7 +344,7 @@ jobs: permissions: id-token: write steps: - - uses: actions/download-artifact@v4.1.7 + - uses: actions/download-artifact@v4 with: pattern: dist-* merge-multiple: true