Skip to content

Commit

Permalink
[3.12] gh-109408: Move Windows builds from Azure Pipelines PR to GitH…
Browse files Browse the repository at this point in the history
…ub 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 <hugovk@users.noreply.github.com>
  • Loading branch information
miss-islington and hugovk authored Sep 22, 2023
1 parent 5796d69 commit 92a3479
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 31 deletions.
31 changes: 0 additions & 31 deletions .azure-pipelines/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,3 @@ jobs:

steps:
- template: ./posix-steps.yml


- job: Windows_PR_Tests
displayName: Windows PR Tests
dependsOn: Prebuild
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))

pool:
vmImage: windows-2022

strategy:
matrix:
win32:
arch: win32
buildOpt: '-p Win32'
testRunTitle: '$(System.PullRequest.TargetBranch)-win32'
testRunPlatform: win32
win64:
arch: amd64
buildOpt: '-p x64'
testRunTitle: '$(System.PullRequest.TargetBranch)-win64'
testRunPlatform: win64
winarm64:
arch: arm64
buildOpt: '-p arm64'
maxParallel: 4

steps:
- template: ./windows-steps.yml
parameters:
targetBranch: $(System.PullRequest.TargetBranch)
20 changes: 20 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ jobs:
path: config.cache
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
- uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: Install Dependencies
run: sudo ./.github/workflows/posix-deps-apt.sh
- name: Add ccache to PATH
Expand Down Expand Up @@ -244,6 +246,21 @@ jobs:
- name: Tests
run: .\PCbuild\rt.bat -p x64 -d -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0

build_win_arm64:
name: 'Windows (arm64)'
runs-on: windows-latest
timeout-minutes: 60
needs: check_source
if: needs.check_source.outputs.run_tests == 'true'
env:
IncludeUwp: 'true'
steps:
- uses: actions/checkout@v4
- name: Register MSVC problem matcher
run: echo "::add-matcher::.github/problem-matchers/msvc.json"
- name: Build CPython
run: .\PCbuild\build.bat -e -d -p arm64

build_macos:
name: 'macOS'
runs-on: macos-latest
Expand Down Expand Up @@ -573,6 +590,7 @@ jobs:
- check_generated_files
- build_win32
- build_win_amd64
- build_win_arm64
- build_macos
- build_ubuntu
- build_ubuntu_ssltests
Expand All @@ -589,6 +607,7 @@ jobs:
build_macos,
build_ubuntu_ssltests,
build_win32,
build_win_arm64,
test_hypothesis,
allowed-skips: >-
${{
Expand All @@ -604,6 +623,7 @@ jobs:
check_generated_files,
build_win32,
build_win_amd64,
build_win_arm64,
build_macos,
build_ubuntu,
build_ubuntu_ssltests,
Expand Down

0 comments on commit 92a3479

Please sign in to comment.