Skip to content

Commit b40067d

Browse files
committed
[3.11] pythongh-109408: Move Windows builds from Azure Pipelines PR to GitHub Actions (pythonGH-109569)
(cherry picked from commit 14cdefa) Co-authored-by: Hugo van Kemenade <[email protected]>
1 parent a023de6 commit b40067d

File tree

2 files changed

+20
-31
lines changed

2 files changed

+20
-31
lines changed

.azure-pipelines/pr.yml

-31
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,3 @@ jobs:
2626

2727
steps:
2828
- template: ./posix-steps.yml
29-
30-
31-
- job: Windows_PR_Tests
32-
displayName: Windows PR Tests
33-
dependsOn: Prebuild
34-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
35-
36-
pool:
37-
vmImage: windows-2022
38-
39-
strategy:
40-
matrix:
41-
win32:
42-
arch: win32
43-
buildOpt: '-p Win32'
44-
testRunTitle: '$(System.PullRequest.TargetBranch)-win32'
45-
testRunPlatform: win32
46-
win64:
47-
arch: amd64
48-
buildOpt: '-p x64'
49-
testRunTitle: '$(System.PullRequest.TargetBranch)-win64'
50-
testRunPlatform: win64
51-
winarm64:
52-
arch: arm64
53-
buildOpt: '-p arm64'
54-
maxParallel: 4
55-
56-
steps:
57-
- template: ./windows-steps.yml
58-
parameters:
59-
targetBranch: $(System.PullRequest.TargetBranch)

.github/workflows/build.yml

+20
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ jobs:
150150
path: config.cache
151151
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
152152
- uses: actions/setup-python@v4
153+
with:
154+
python-version: '3.x'
153155
- name: Install Dependencies
154156
run: sudo ./.github/workflows/posix-deps-apt.sh
155157
- name: Add ccache to PATH
@@ -230,6 +232,21 @@ jobs:
230232
- name: Tests
231233
run: .\PCbuild\rt.bat -p x64 -d -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0
232234

235+
build_win_arm64:
236+
name: 'Windows (arm64)'
237+
runs-on: windows-latest
238+
timeout-minutes: 60
239+
needs: check_source
240+
if: needs.check_source.outputs.run_tests == 'true'
241+
env:
242+
IncludeUwp: 'true'
243+
steps:
244+
- uses: actions/checkout@v4
245+
- name: Register MSVC problem matcher
246+
run: echo "::add-matcher::.github/problem-matchers/msvc.json"
247+
- name: Build CPython
248+
run: .\PCbuild\build.bat -e -d -p arm64
249+
233250
build_macos:
234251
name: 'macOS'
235252
runs-on: macos-latest
@@ -450,6 +467,7 @@ jobs:
450467
- check_generated_files
451468
- build_win32
452469
- build_win_amd64
470+
- build_win_arm64
453471
- build_macos
454472
- build_ubuntu
455473
- build_ubuntu_ssltests
@@ -465,6 +483,7 @@ jobs:
465483
build_macos,
466484
build_ubuntu_ssltests,
467485
build_win32,
486+
build_win_arm64,
468487
allowed-skips: >-
469488
${{
470489
!fromJSON(needs.check_source.outputs.run-docs)
@@ -479,6 +498,7 @@ jobs:
479498
check_generated_files,
480499
build_win32,
481500
build_win_amd64,
501+
build_win_arm64,
482502
build_macos,
483503
build_ubuntu,
484504
build_ubuntu_ssltests,

0 commit comments

Comments
 (0)