Skip to content

Commit 9930821

Browse files
authored
ci: update arm64 runners to arm-4core-linux-ubuntu24.04 (#13284)
These new images are more similar to the default ones, including Docker.
1 parent 5c7228a commit 9930821

File tree

1 file changed

+6
-19
lines changed

1 file changed

+6
-19
lines changed

.github/workflows/build_python_3.yml

+6-19
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
MATRIX_INCLUDE=$(
3434
{
3535
cibuildwheel --print-build-identifiers --platform linux --arch x86_64,i686 | jq -cR '{only: ., os: "ubuntu-latest"}' \
36-
&& cibuildwheel --print-build-identifiers --platform linux --arch aarch64 | jq -cR '{only: ., os: "arm-4core-linux"}' \
36+
&& cibuildwheel --print-build-identifiers --platform linux --arch aarch64 | jq -cR '{only: ., os: "arm-4core-linux-ubuntu24.04"}' \
3737
&& cibuildwheel --print-build-identifiers --platform windows --arch AMD64,x86 | grep -v 313 | jq -cR '{only: ., os: "windows-latest"}' \
3838
&& cibuildwheel --print-build-identifiers --platform macos --arch x86_64 | jq -cR '{only: ., os: "macos-13"}' \
3939
&& cibuildwheel --print-build-identifiers --platform macos --arch arm64 | jq -cR '{only: ., os: "macos-latest"}'
@@ -59,33 +59,20 @@ jobs:
5959
fetch-depth: 0
6060

6161
- uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
62-
if: matrix.os != 'arm-4core-linux'
62+
if: matrix.os != 'arm-4core-linux-ubuntu24.04'
6363
name: Install Python
6464
with:
6565
python-version: '3.8'
6666

67-
- name: Install docker and pipx
68-
if: matrix.os == 'arm-4core-linux'
69-
# The ARM64 Ubuntu has less things installed by default
70-
# We need docker, pip and venv for cibuildwheel
71-
# acl allows us to use docker in the same session
72-
run: |
73-
curl -fsSL https://get.docker.com -o get-docker.sh
74-
sudo sh get-docker.sh
75-
sudo usermod -a -G docker $USER
76-
sudo apt install -y acl python3.10-venv python3-pip
77-
sudo setfacl --modify user:runner:rw /var/run/docker.sock
78-
python3 -m pip install pipx
79-
8067
- name: Set up QEMU
81-
if: runner.os == 'Linux' && matrix.os != 'arm-4core-linux'
68+
if: runner.os == 'Linux' && matrix.os != 'arm-4core-linux-ubuntu24.04'
8269
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
8370
with:
8471
platforms: all
8572

8673
- name: Build wheels arm64
87-
if: always() && matrix.os == 'arm-4core-linux'
88-
run: /home/runner/.local/bin/pipx run cibuildwheel==2.22.0 --only ${{ matrix.only }}
74+
if: always() && matrix.os == 'arm-4core-linux-ubuntu24.04'
75+
run: pipx run cibuildwheel==2.22.0 --only ${{ matrix.only }}
8976
env:
9077
CIBW_SKIP: ${{ inputs.cibw_skip }}
9178
CIBW_PRERELEASE_PYTHONS: ${{ inputs.cibw_prerelease_pythons }}
@@ -119,7 +106,7 @@ jobs:
119106
# CIBW_BUILD_VERBOSITY_MACOS: 3
120107

121108
- name: Build wheels
122-
if: always() && matrix.os != 'arm-4core-linux'
109+
if: always() && matrix.os != 'arm-4core-linux-ubuntu24.04'
123110
uses: pypa/cibuildwheel@d04cacbc9866d432033b1d09142936e6a0e2121a # v2.23.2
124111
with:
125112
only: ${{ matrix.only }}

0 commit comments

Comments
 (0)