From a3c7b0f2457b30634f2abd0987f9e24426405132 Mon Sep 17 00:00:00 2001 From: Diego Russo Date: Fri, 17 Jan 2025 14:33:37 +0000 Subject: [PATCH 1/2] Move to public Linux arm64 hosted runners --- .github/actionlint.yaml | 4 ++-- .github/workflows/build.yml | 7 +------ .github/workflows/jit.yml | 6 ++---- .pre-commit-config.yaml | 2 +- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index 3701f7297ffeb2..af125266ae7813 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 9adf860632e8a2..0ffad6656c0129 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -240,12 +240,7 @@ jobs: - true os: - ubuntu-24.04 - - ubuntu-24.04-aarch64 - is-fork: # only used for the exclusion trick - - ${{ github.repository_owner != 'python' }} - exclude: - - os: ubuntu-24.04-aarch64 - is-fork: true + - ubuntu-24.04-arm uses: ./.github/workflows/reusable-ubuntu.yml with: config_hash: ${{ needs.check_source.outputs.config_hash }} diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml index 9b84998a55666d..6f214ad4bc6978 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 af6accd89b5bd4..f94c0eb23a42bf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -58,7 +58,7 @@ repos: - id: check-readthedocs - repo: https://github.com/rhysd/actionlint - rev: v1.7.4 + rev: 5c31ede97e317fa55abe8b5a330369defac78252 hooks: - id: actionlint From ef95b4a6e5c12fd544070694f8448c063507839d Mon Sep 17 00:00:00 2001 From: Diego Russo Date: Mon, 20 Jan 2025 09:35:22 +0000 Subject: [PATCH 2/2] Bump action lint to 1.7.7 Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f94c0eb23a42bf..c6f993e4cb533a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -58,7 +58,7 @@ repos: - id: check-readthedocs - repo: https://github.com/rhysd/actionlint - rev: 5c31ede97e317fa55abe8b5a330369defac78252 + rev: v1.7.7 hooks: - id: actionlint