File tree Expand file tree Collapse file tree 5 files changed +42
-22
lines changed
Expand file tree Collapse file tree 5 files changed +42
-22
lines changed Original file line number Diff line number Diff line change 1+ self-hosted-runner:
2+ labels: ["ubuntu-24.04-aarch64", "windows-aarch64"]
3+
4+ config-variables: null
5+
6+ paths:
7+ .github/workflows/**/*.yml:
8+ ignore:
9+ - 1st argument of function call is not assignable
10+ - SC2(015|038|086|091|097|098|129|155)
Original file line number Diff line number Diff line change @@ -150,16 +150,28 @@ jobs:
150150 needs: check_source
151151 if: fromJSON(needs.check_source.outputs.run_tests)
152152 strategy:
153+ fail-fast: false
153154 matrix:
155+ os:
156+ - windows-latest
154157 arch:
155- - Win32
156- - x64
157- - arm64
158+ - x64
158159 free-threading:
159- - false
160- - true
160+ - false
161+ - true
162+ include:
163+ - os: windows-latest # FIXME(diegorusso): change to os: windows-aarch64
164+ arch: arm64
165+ free-threading: false
166+ - os: windows-latest # FIXME(diegorusso): change to os: windows-aarch64
167+ arch: arm64
168+ free-threading: true
169+ - os: windows-latest
170+ arch: Win32
171+ free-threading: false
161172 uses: ./.github/workflows/reusable-windows.yml
162173 with:
174+ os: ${{ matrix.os }}
163175 arch: ${{ matrix.arch }}
164176 free-threading: ${{ matrix.free-threading }}
165177
Original file line number Diff line number Diff line change 2020 strategy:
2121 fail-fast: false
2222 matrix:
23- os: [ubuntu-24.04]
23+ os: [ubuntu-24.04, ubuntu-24.04-aarch64 ]
2424 env:
2525 FORCE_COLOR: 1
2626 OPENSSL_VER: 3.0.15
@@ -82,11 +82,11 @@ jobs:
8282 - name: Build CPython out-of-tree
8383 if: ${{ inputs.free-threading }}
8484 working-directory: ${{ env.CPYTHON_BUILDDIR }}
85- run: make -j4
85+ run: make -j
8686 - name: Build CPython out-of-tree (for compiler warning check)
8787 if: ${{ !inputs.free-threading}}
8888 working-directory: ${{ env.CPYTHON_BUILDDIR }}
89- run: set -o pipefail; make -j4 --output-sync 2>&1 | tee compiler_output_ubuntu.txt
89+ run: set -o pipefail; make -j --output-sync 2>&1 | tee compiler_output_ubuntu.txt
9090 - name: Display build info
9191 working-directory: ${{ env.CPYTHON_BUILDDIR }}
9292 run: make pythoninfo
Original file line number Diff line number Diff line change @@ -3,6 +3,10 @@ name: Reusable Windows
33on:
44 workflow_call:
55 inputs:
6+ os:
7+ description: OS to run on
8+ required: true
9+ type: string
610 arch:
711 description: CPU architecture
812 required: true
1923
2024jobs:
2125 build:
22- name: >-
23- build${{ inputs.arch != 'arm64' && ' and test' || '' }}
24- (${{ inputs.arch }})
25- runs-on: windows-latest
26+ name: 'build and test (${{ inputs.arch }})'
27+ runs-on: ${{ inputs.os }}
2628 timeout-minutes: 60
2729 steps:
2830 - uses: actions/checkout@v4
@@ -31,17 +33,17 @@ jobs:
3133 run: echo "::add-matcher::.github/problem-matchers/msvc.json"
3234 - name: Build CPython
3335 run: >-
34- .\PCbuild\build.bat
36+ .\\ PCbuild\ \build.bat
3537 -e -d -v
3638 -p ${{ inputs.arch }}
3739 ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
38- - name: Display build info
40+ - name: Display build info # FIXME(diegorusso): remove the `if`
3941 if: inputs.arch != 'arm64'
40- run: .\python.bat -m test.pythoninfo
41- - name: Tests
42+ run: .\\ python.bat -m test.pythoninfo
43+ - name: Tests # FIXME(diegorusso): remove the `if`
4244 if: inputs.arch != 'arm64'
4345 run: >-
44- .\PCbuild\rt.bat
46+ .\\ PCbuild\ \rt.bat
4547 -p ${{ inputs.arch }}
4648 -d -q --fast-ci
4749 ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
Original file line number Diff line number Diff line change @@ -57,13 +57,9 @@ repos:
5757 - id: check-github-workflows
5858
5959 - repo: https://github.com/rhysd/actionlint
60- rev: v1.7.3
60+ rev: v1.7.4
6161 hooks:
6262 - id: actionlint
63- args: [
64- -ignore=1st argument of function call is not assignable,
65- -ignore=SC2(015|038|086|091|097|098|129|155),
66- ]
6763
6864 - repo: https://github.com/sphinx-contrib/sphinx-lint
6965 rev: v1.0.0
You can’t perform that action at this time.
0 commit comments