Skip to content

Commit 46c90b3

Browse files
authored
Remove QEMU in build_pypi workflow (#305)
1 parent 33d9fc8 commit 46c90b3

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

.github/build_pypi_wheel.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ WHEEL_NAME=$(ls $WHEEL_OUTPUT_FOLDER)
3333
echo "Temporary wheel: $(ls $WHEEL_OUTPUT_FOLDER)"
3434
auditwheel show $WHEEL_OUTPUT_FOLDER/$WHEEL_NAME
3535

36-
echo "Auditing wheel to platform $PLAT..."
36+
echo "Auditing wheel to platform $DOCKER_IMG..."
3737
auditwheel repair $WHEEL_OUTPUT_FOLDER/$WHEEL_NAME -w $WHEEL_OUTPUT_FOLDER
3838
rm $WHEEL_OUTPUT_FOLDER/$WHEEL_NAME
3939

.github/workflows/build_pypi.yml

+13-12
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,38 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
python-version: ["3.9", "3.10", "3.11", "3.12"]
13-
build_platform: ["manylinux2014_x86_64", "manylinux2014_aarch64"]
13+
platform: [ubuntu-22.04, ubuntu-22.04-arm]
14+
include:
15+
- image: "manylinux2014_x86_64"
16+
platform: ubuntu-22.04
17+
- image: "manylinux2014_aarch64"
18+
platform: ubuntu-22.04-arm
1419

15-
runs-on: ubuntu-20.04
20+
runs-on: ${{ matrix.platform }}
1621

1722
steps:
18-
- uses: actions/checkout@v1
23+
- uses: actions/checkout@v4
24+
with:
25+
fetch-depth: 0
1926

2027
- name: Set up Python ${{ matrix.python-version }}
21-
uses: actions/setup-python@v1
28+
uses: actions/setup-python@v5
2229
with:
2330
python-version: ${{ matrix.python-version }}
2431

25-
- name: Set up QEMU
26-
uses: docker/setup-qemu-action@v1
27-
with:
28-
platforms: all
29-
3032
- name: Build Wheel
3133
env:
32-
DOCKER_IMG: quay.io/pypa/${{ matrix.build_platform }}
34+
DOCKER_IMG: quay.io/pypa/${{ matrix.image }}
3335
DOCKER_MNT: pypi_build
3436
WHEEL_DIR: wheel # wheel location
3537
run: |
3638
echo "Build wheel for PECOS using Python version ${{ matrix.python-version }}..."
3739
docker run --rm -v $(pwd):/$DOCKER_MNT \
38-
--env PLAT=${{ matrix.build_platform }} --env PIP_VER=${{ matrix.python-version }} \
40+
--env DOCKER_IMG=$DOCKER_IMG --env PIP_VER=${{ matrix.python-version }} \
3941
--env DOCKER_MNT=$DOCKER_MNT --env WHEEL_DIR=$WHEEL_DIR \
4042
$DOCKER_IMG /bin/bash /$DOCKER_MNT/.github/build_pypi_wheel.sh
4143
4244
- name: Test Wheel
43-
if: matrix.build_platform == 'manylinux2014_x86_64' # Only test for x86, aarch64 simulation too slow
4445
env:
4546
WHEEL_DIR: wheel # wheel location
4647
run: |

0 commit comments

Comments
 (0)