Skip to content

Commit c7cf17f

Browse files
authored
ci: update arm64 runners to arm-4core-linux-ubuntu24.04 [2.21] (#13289)
These new images are more similar to the default ones, including Docker. (cherry picked from commit 9930821) Backport for #13284
1 parent d30cde0 commit c7cf17f

File tree

1 file changed

+6
-19
lines changed

1 file changed

+6
-19
lines changed

.github/workflows/build_python_3.yml

Lines changed: 6 additions & 19 deletions
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,universal2 | jq -cR '{only: ., os: "macos-13"}'
3939
} | jq -sc
@@ -57,33 +57,20 @@ jobs:
5757
fetch-depth: 0
5858

5959
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
60-
if: matrix.os != 'arm-4core-linux'
60+
if: matrix.os != 'arm-4core-linux-ubuntu24.04'
6161
name: Install Python
6262
with:
6363
python-version: '3.8'
6464

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

8471
- name: Build wheels arm64
85-
if: always() && matrix.os == 'arm-4core-linux'
86-
run: /home/runner/.local/bin/pipx run cibuildwheel==2.22.0 --only ${{ matrix.only }}
72+
if: always() && matrix.os == 'arm-4core-linux-ubuntu24.04'
73+
run: pipx run cibuildwheel==2.22.0 --only ${{ matrix.only }}
8774
env:
8875
CIBW_SKIP: ${{ inputs.cibw_skip }}
8976
CIBW_PRERELEASE_PYTHONS: ${{ inputs.cibw_prerelease_pythons }}
@@ -116,7 +103,7 @@ jobs:
116103
# CIBW_BUILD_VERBOSITY_MACOS: 3
117104

118105
- name: Build wheels
119-
if: always() && matrix.os != 'arm-4core-linux'
106+
if: always() && matrix.os != 'arm-4core-linux-ubuntu24.04'
120107
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
121108
with:
122109
only: ${{ matrix.only }}

0 commit comments

Comments
 (0)