From b04cdb745f472a5f1ee60eb290a43cb0e513988f Mon Sep 17 00:00:00 2001 From: Jurgen Lentz Date: Wed, 16 Oct 2024 18:40:39 +0200 Subject: [PATCH] update ci build --- .github/workflows/build-and-test.yaml | 10 +++++----- azure-pipelines.yml | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 2e1b7d8..0e65c86 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -19,7 +19,7 @@ jobs: os: [ubuntu-20.04, windows-2022, macos-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download libampl run: python3 dev/updatelib.py @@ -34,7 +34,7 @@ jobs: CIBW_TEST_COMMAND: ${{ env.CIBW_TEST_COMMAND }} CIBW_TEST_REQUIRES: ${{ env.CIBW_TEST_REQUIRES }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl @@ -48,10 +48,10 @@ jobs: build: [cp36-*, cp37-*, cp38-*, cp39-*, cp310-*, cp311-*, cp312-*, cp313-*] runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: all @@ -68,6 +68,6 @@ jobs: CIBW_TEST_COMMAND: ${{ env.CIBW_TEST_COMMAND }} CIBW_TEST_REQUIRES: --index-url https://pypi.ampl.com --extra-index-url https://pypi.org/simple ampl_module_base - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 29df2ec..39dcdc9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,7 +36,7 @@ stages: - bash: | set -ex python dev/updatelib.py - python -m pip install --upgrade cibuildwheel==2.16.5 + python -m pip install --upgrade cibuildwheel==2.21.3 cibuildwheel --platform linux --output-dir wheelhouse . displayName: Build wheels - task: PublishBuildArtifacts@1 @@ -48,7 +48,7 @@ stages: - bash: | set -ex python dev/updatelib.py - python -m pip install --upgrade cibuildwheel==2.16.5 + python -m pip install --upgrade cibuildwheel==2.21.3 cibuildwheel --platform macos --output-dir wheelhouse . displayName: Build wheels - task: PublishBuildArtifacts@1 @@ -60,7 +60,7 @@ stages: - bash: | set -ex python dev/updatelib.py - python -m pip install --upgrade cibuildwheel==2.16.5 + python -m pip install --upgrade cibuildwheel==2.21.3 cibuildwheel --platform windows --output-dir wheelhouse . displayName: Build wheels - task: PublishBuildArtifacts@1 @@ -101,6 +101,10 @@ stages: CIBW_BUILD: cp312-* CIBW_ARCHS_LINUX: aarch64 CIBW_TEST_REQUIRES: $(CIBW_TEST_REQUIRES_AARCH64) + aarch64 cp313: + CIBW_BUILD: cp313-* + CIBW_ARCHS_LINUX: aarch64 + CIBW_TEST_REQUIRES: $(CIBW_TEST_REQUIRES_AARCH64) ppc64le cp36: CIBW_BUILD: cp36-* CIBW_ARCHS_LINUX: ppc64le @@ -129,6 +133,10 @@ stages: CIBW_BUILD: cp312-* CIBW_ARCHS_LINUX: ppc64le CIBW_TEST_REQUIRES: $(CIBW_TEST_REQUIRES_PPC64LE) + ppc64le cp313: + CIBW_BUILD: cp313-* + CIBW_ARCHS_LINUX: ppc64le + CIBW_TEST_REQUIRES: $(CIBW_TEST_REQUIRES_PPC64LE) steps: - task: UsePythonVersion@0 - bash: docker run --rm --privileged multiarch/qemu-user-static --persistent yes @@ -136,7 +144,7 @@ stages: - bash: | set -ex python dev/updatelib.py - python -m pip install --upgrade cibuildwheel==2.16.5 + python -m pip install --upgrade cibuildwheel==2.21.3 cibuildwheel --platform linux --output-dir wheelhouse . displayName: Build wheels - task: PublishBuildArtifacts@1