From 6c914bf85cc3a07e22e4618d0b5607c158e3cf66 Mon Sep 17 00:00:00 2001 From: Diego Russo Date: Mon, 20 Jan 2025 16:51:09 +0000 Subject: [PATCH] Move to public Linux arm64 hosted runners (#128964) Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- .github/actionlint.yaml | 4 ++-- .github/workflows/build.yml | 8 ++------ .github/workflows/jit.yml | 6 ++---- .pre-commit-config.yaml | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index 3701f7297ff..af125266ae7 100644 --- a/.github/actionlint.yaml +++ b/.github/actionlint.yaml @@ -1,5 +1,5 @@ self-hosted-runner: - labels: ["ubuntu-24.04-aarch64", "windows-aarch64"] + labels: ["windows-aarch64"] config-variables: null @@ -7,4 +7,4 @@ paths: .github/workflows/**/*.yml: ignore: - 1st argument of function call is not assignable - - SC2(015|038|086|091|097|098|129|155) \ No newline at end of file + - SC2(015|038|086|091|097|098|129|155) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a70cde3d8b..66675123697 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -244,17 +244,13 @@ jobs: - true os: - ubuntu-24.04 - - ubuntu-24.04-aarch64 - is-fork: # only used for the exclusion trick - - ${{ github.repository_owner != 'python' }} + - ubuntu-24.04-arm exclude: - - os: ubuntu-24.04-aarch64 - is-fork: true # Do not test BOLT with free-threading, to conserve resources - bolt: true free-threading: true # BOLT currently crashes during instrumentation on aarch64 - - os: ubuntu-24.04-aarch64 + - os: ubuntu-24.04-arm bolt: true uses: ./.github/workflows/reusable-ubuntu.yml with: diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml index 9b84998a556..6f214ad4bc6 100644 --- a/.github/workflows/jit.yml +++ b/.github/workflows/jit.yml @@ -83,8 +83,7 @@ jobs: runner: ubuntu-24.04 - target: aarch64-unknown-linux-gnu/gcc architecture: aarch64 - # Forks don't have access to our paid AArch64 runners. These jobs are skipped below: - runner: ${{ github.repository_owner == 'python' && 'ubuntu-24.04-aarch64' || 'ubuntu-24.04' }} + runner: ubuntu-24.04-arm steps: - uses: actions/checkout@v4 with: @@ -123,8 +122,7 @@ jobs: ./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 - name: Native Linux - # Forks don't have access to our paid AArch64 runners. Skip those: - if: runner.os == 'Linux' && (matrix.architecture == 'x86_64' || github.repository_owner == 'python') + if: runner.os == 'Linux' run: | sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }} export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 74b56f06034..fb44c27704d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -56,7 +56,7 @@ repos: - id: check-readthedocs - repo: https://github.com/rhysd/actionlint - rev: v1.7.6 + rev: v1.7.7 hooks: - id: actionlint