Skip to content

Commit

Permalink
update ci build
Browse files Browse the repository at this point in the history
  • Loading branch information
jurgen-lentz committed Oct 16, 2024
1 parent e63b971 commit b04cdb7
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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

Expand 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
16 changes: 12 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -129,14 +133,18 @@ 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
displayName: Configure qemu
- 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
Expand Down

0 comments on commit b04cdb7

Please sign in to comment.