mirror of
https://github.com/python/cpython.git
synced 2025-12-31 04:23:37 +00:00
[3.13] Enable aarch64 Ubuntu CI jobs (GH-125786) (GH-127170)
This change enables custom GHA runners for Ubuntu-24.04 that run on Arm hardware. It also prepares for Windows runners on Arm hardware, but doesn't enable that just yet, because the Arm GHA runner images for Windows need to be updated.
(cherry picked from commit 8214e0f709)
This commit is contained in:
parent
9291095a74
commit
d87fb9c30d
3 changed files with 30 additions and 16 deletions
22
.github/workflows/build.yml
vendored
22
.github/workflows/build.yml
vendored
|
|
@ -193,16 +193,28 @@ jobs:
|
|||
needs: check_source
|
||||
if: fromJSON(needs.check_source.outputs.run_tests)
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os:
|
||||
- windows-latest
|
||||
arch:
|
||||
- Win32
|
||||
- x64
|
||||
- arm64
|
||||
- x64
|
||||
free-threading:
|
||||
- false
|
||||
- true
|
||||
- false
|
||||
- true
|
||||
include:
|
||||
- os: windows-latest # FIXME(diegorusso): change to os: windows-aarch64
|
||||
arch: arm64
|
||||
free-threading: false
|
||||
- os: windows-latest # FIXME(diegorusso): change to os: windows-aarch64
|
||||
arch: arm64
|
||||
free-threading: true
|
||||
- os: windows-latest
|
||||
arch: Win32
|
||||
free-threading: false
|
||||
uses: ./.github/workflows/reusable-windows.yml
|
||||
with:
|
||||
os: ${{ matrix.os }}
|
||||
arch: ${{ matrix.arch }}
|
||||
free-threading: ${{ matrix.free-threading }}
|
||||
|
||||
|
|
|
|||
4
.github/workflows/reusable-ubuntu.yml
vendored
4
.github/workflows/reusable-ubuntu.yml
vendored
|
|
@ -20,7 +20,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-24.04]
|
||||
os: [ubuntu-24.04, ubuntu-24.04-aarch64]
|
||||
env:
|
||||
FORCE_COLOR: 1
|
||||
OPENSSL_VER: 3.0.15
|
||||
|
|
@ -79,7 +79,7 @@ jobs:
|
|||
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
|
||||
- name: Build CPython out-of-tree
|
||||
working-directory: ${{ env.CPYTHON_BUILDDIR }}
|
||||
run: make -j4
|
||||
run: make -j
|
||||
- name: Display build info
|
||||
working-directory: ${{ env.CPYTHON_BUILDDIR }}
|
||||
run: make pythoninfo
|
||||
|
|
|
|||
20
.github/workflows/reusable-windows.yml
vendored
20
.github/workflows/reusable-windows.yml
vendored
|
|
@ -3,6 +3,10 @@ name: Reusable Windows
|
|||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
os:
|
||||
description: OS to run on
|
||||
required: true
|
||||
type: string
|
||||
arch:
|
||||
description: CPU architecture
|
||||
required: true
|
||||
|
|
@ -19,10 +23,8 @@ env:
|
|||
|
||||
jobs:
|
||||
build:
|
||||
name: >-
|
||||
build${{ inputs.arch != 'arm64' && ' and test' || '' }}
|
||||
(${{ inputs.arch }})
|
||||
runs-on: windows-latest
|
||||
name: 'build and test (${{ inputs.arch }})'
|
||||
runs-on: ${{ inputs.os }}
|
||||
timeout-minutes: 60
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
|
@ -31,17 +33,17 @@ jobs:
|
|||
run: echo "::add-matcher::.github/problem-matchers/msvc.json"
|
||||
- name: Build CPython
|
||||
run: >-
|
||||
.\PCbuild\build.bat
|
||||
.\\PCbuild\\build.bat
|
||||
-e -d -v
|
||||
-p ${{ inputs.arch }}
|
||||
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
|
||||
- name: Display build info
|
||||
- name: Display build info # FIXME(diegorusso): remove the `if`
|
||||
if: inputs.arch != 'arm64'
|
||||
run: .\python.bat -m test.pythoninfo
|
||||
- name: Tests
|
||||
run: .\\python.bat -m test.pythoninfo
|
||||
- name: Tests # FIXME(diegorusso): remove the `if`
|
||||
if: inputs.arch != 'arm64'
|
||||
run: >-
|
||||
.\PCbuild\rt.bat
|
||||
.\\PCbuild\\rt.bat
|
||||
-p ${{ inputs.arch }}
|
||||
-d -q --fast-ci
|
||||
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue