File tree 4 files changed +12
-17
lines changed
4 files changed +12
-17
lines changed Original file line number Diff line number Diff line change @@ -164,10 +164,10 @@ jobs:
164
164
- false
165
165
- true
166
166
include :
167
- - os : windows-latest # FIXME(diegorusso): change to os: windows- aarch64
167
+ - os : windows-aarch64
168
168
arch : arm64
169
169
free-threading : false
170
- - os : windows-latest # FIXME(diegorusso): change to os: windows- aarch64
170
+ - os : windows-aarch64
171
171
arch : arm64
172
172
free-threading : true
173
173
- os : windows-latest
@@ -193,6 +193,7 @@ jobs:
193
193
- arm64
194
194
uses : ./.github/workflows/reusable-windows-msi.yml
195
195
with :
196
+ os : ${{ matrix.os }}
196
197
arch : ${{ matrix.arch }}
197
198
198
199
build-macos :
Original file line number Diff line number Diff line change 74
74
runner : windows-latest
75
75
- target : aarch64-pc-windows-msvc/msvc
76
76
architecture : ARM64
77
- runner : windows-latest
77
+ runner : windows-aarch64
78
78
- target : x86_64-apple-darwin/clang
79
79
architecture : x86_64
80
80
runner : macos-13
@@ -96,19 +96,11 @@ jobs:
96
96
python-version : ' 3.11'
97
97
98
98
- name : Native Windows
99
- if : runner.os == 'Windows' && matrix.architecture != 'ARM64'
100
99
run : |
101
100
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
102
101
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}
103
102
./PCbuild/rt.bat ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
104
103
105
- # No tests (yet):
106
- - name : Emulated Windows
107
- if : runner.os == 'Windows' && matrix.architecture == 'ARM64'
108
- run : |
109
- choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
110
- ./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}
111
-
112
104
# The `find` line is required as a result of https://github.com/actions/runner-images/issues/9966.
113
105
# This is a bug in the macOS runner image where the pre-installed Python is installed in the same
114
106
# directory as the Homebrew Python, which causes the build to fail for macos-13. This line removes
Original file line number Diff line number Diff line change @@ -3,6 +3,10 @@ name: Reusable Windows MSI
3
3
on :
4
4
workflow_call :
5
5
inputs :
6
+ os :
7
+ description : OS to run on
8
+ required : true
9
+ type : string
6
10
arch :
7
11
description : CPU architecture
8
12
required : true
17
21
jobs :
18
22
build :
19
23
name : installer for ${{ inputs.arch }}
20
- runs-on : windows-latest
24
+ runs-on : ${{ inputs.os }}
21
25
timeout-minutes : 60
22
26
env :
23
27
ARCH : ${{ inputs.arch }}
Original file line number Diff line number Diff line change 24
24
25
25
jobs :
26
26
build :
27
- name : ${{ inputs.arch == 'arm64' && 'build' || 'build and test' }} (${{ inputs.arch }})
27
+ name : Build and test (${{ inputs.arch }})
28
28
runs-on : ${{ inputs.os }}
29
29
timeout-minutes : 60
30
30
env :
43
43
-p "${ARCH}"
44
44
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
45
45
shell : bash
46
- - name : Display build info # FIXME(diegorusso): remove the `if`
47
- if : inputs.arch != 'arm64'
46
+ - name : Display build info
48
47
run : .\\python.bat -m test.pythoninfo
49
- - name : Tests # FIXME(diegorusso): remove the `if`
50
- if : inputs.arch != 'arm64'
48
+ - name : Tests
51
49
run : >-
52
50
.\\PCbuild\\rt.bat
53
51
-p "${ARCH}"
You can’t perform that action at this time.
0 commit comments