Skip to content

Commit

Permalink
update un/download artefacts action to v4
Browse files Browse the repository at this point in the history
  • Loading branch information
dimpase committed Jan 7, 2025
1 parent 190dab4 commit 316a987
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
run: |
python3 -m pip install build
python3 -m build --sdist
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: "dist/*.tar.gz"
name: dist
name: dist-ubuntu-latest
- uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
#
CIBW_ARCHS: ${{ matrix.arch }}
# https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9"
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.10"
# Environment during wheel build
CIBW_ENVIRONMENT: "PATH=$(pwd)/local/bin:$PATH CPATH=$(pwd)/local/include:$CPATH LIBRARY_PATH=$(pwd)/local/lib:$LIBRARY_PATH LD_LIBRARY_PATH=$(pwd)/local/lib:$LD_LIBRARY_PATH PKG_CONFIG_PATH=$(pwd)/local/share/pkgconfig:$PKG_CONFIG_PATH ACLOCAL_PATH=/usr/share/aclocal"
# Use 'build', not 'pip wheel'
Expand All @@ -79,17 +79,17 @@ jobs:
repository: sagemath/sage
ref: develop

- uses: actions/download-artifact@v4.1.7
- uses: actions/download-artifact@v4
with:
name: dist
name: dist-${{ matrix.os }}
path: dist

- uses: actions/setup-python@v5
# As of 2024-02-03, the macOS M1 runners do not have preinstalled python or pipx.
# Installing pipx follows the approach of https://github.com/pypa/cibuildwheel/pull/1743
id: python
with:
python-version: "3.8 - 3.12"
python-version: "3.10 - 3.12"
update-environment: false

- name: Build platform wheels
Expand All @@ -109,9 +109,9 @@ jobs:
"${{ steps.python.outputs.python-path }}" -m pipx run cibuildwheel==2.17.0 unpacked/$pkg*
done
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: wheels
name: wheels-${{ matrix.os }}
path: ./wheelhouse/*.whl

pypi-publish:
Expand All @@ -124,7 +124,7 @@ jobs:
CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
steps:

- uses: actions/download-artifact@v4.1.7
- uses: actions/download-artifact@v4
with:
name: wheels
path: wheelhouse
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ jobs:
&& echo "sage-package create ${{ env.SPKG }} --version git --tarball ${{ env.SPKG }}-git.tar.gz --type=standard" > upstream/update-pkgs.sh \
&& if [ -n "${{ env.REMOVE_PATCHES }}" ]; then echo "(cd ../build/pkgs/${{ env.SPKG }}/patches && rm -f ${{ env.REMOVE_PATCHES }}; :)" >> upstream/update-pkgs.sh; fi \
&& ls -l upstream/
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: upstream
path: upstream-ubuntu-latest
name: upstream

linux-sage:
Expand Down

0 comments on commit 316a987

Please sign in to comment.