Skip to content

Commit 92a3479

Browse files
[3.12] gh-109408: Move Windows builds from Azure Pipelines PR to GitHub Actions (GH-109569) (#109623)
gh-109408: Move Windows builds from Azure Pipelines PR to GitHub Actions (GH-109569) (cherry picked from commit 14cdefa) Co-authored-by: Hugo van Kemenade <[email protected]>
1 parent 5796d69 commit 92a3479

File tree

2 files changed

+20
-31
lines changed

2 files changed

+20
-31
lines changed

.azure-pipelines/pr.yml

Lines changed: 0 additions & 31 deletions
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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ jobs:
161161
path: config.cache
162162
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
163163
- uses: actions/setup-python@v4
164+
with:
165+
python-version: '3.x'
164166
- name: Install Dependencies
165167
run: sudo ./.github/workflows/posix-deps-apt.sh
166168
- name: Add ccache to PATH
@@ -244,6 +246,21 @@ jobs:
244246
- name: Tests
245247
run: .\PCbuild\rt.bat -p x64 -d -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0
246248

249+
build_win_arm64:
250+
name: 'Windows (arm64)'
251+
runs-on: windows-latest
252+
timeout-minutes: 60
253+
needs: check_source
254+
if: needs.check_source.outputs.run_tests == 'true'
255+
env:
256+
IncludeUwp: 'true'
257+
steps:
258+
- uses: actions/checkout@v4
259+
- name: Register MSVC problem matcher
260+
run: echo "::add-matcher::.github/problem-matchers/msvc.json"
261+
- name: Build CPython
262+
run: .\PCbuild\build.bat -e -d -p arm64
263+
247264
build_macos:
248265
name: 'macOS'
249266
runs-on: macos-latest
@@ -573,6 +590,7 @@ jobs:
573590
- check_generated_files
574591
- build_win32
575592
- build_win_amd64
593+
- build_win_arm64
576594
- build_macos
577595
- build_ubuntu
578596
- build_ubuntu_ssltests
@@ -589,6 +607,7 @@ jobs:
589607
build_macos,
590608
build_ubuntu_ssltests,
591609
build_win32,
610+
build_win_arm64,
592611
test_hypothesis,
593612
allowed-skips: >-
594613
${{
@@ -604,6 +623,7 @@ jobs:
604623
check_generated_files,
605624
build_win32,
606625
build_win_amd64,
626+
build_win_arm64,
607627
build_macos,
608628
build_ubuntu,
609629
build_ubuntu_ssltests,

0 commit comments

Comments
 (0)