File tree 2 files changed +17
-14
lines changed
2 files changed +17
-14
lines changed Original file line number Diff line number Diff line change @@ -81,18 +81,23 @@ jobs:
81
81
include : ${{ fromJSON(needs.calculate_matrix.outputs.jobs) }}
82
82
steps :
83
83
- if : contains(matrix.os, 'windows')
84
- uses : msys2/setup-msys2@v2.22 .0
84
+ uses : msys2/setup-msys2@v2.23 .0
85
85
with :
86
- # i686 jobs use mingw32. x86_64 and cross-compile jobs use mingw64.
87
- msystem : ${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}
86
+ # i686 jobs use mingw32.
87
+ # aarch64 runners use clangarm64.
88
+ # x86_64 and cross-compile jobs use mingw64.
89
+ msystem : ${{ contains(matrix.name, 'i686') && 'mingw32' || contains(matrix.os, 'arm64') && 'clangarm64' || 'mingw64' }}
88
90
# don't try to download updates for already installed packages
89
91
update : false
90
92
# don't try to use the msys that comes built-in to the github runner,
91
93
# so we can control what is installed (i.e. not python)
92
- release : true
94
+ release : ${{ !contains(matrix.os, 'arm64') }}
93
95
# Inherit the full path from the Windows environment, with MSYS2's */bin/
94
96
# dirs placed in front. This lets us run Windows-native Python etc.
95
97
path-type : inherit
98
+ # Workaround for https://github.com/msys2/setup-msys2/issues/358
99
+ # MSYS2 installer hangs on ARM64 Windows if caching is enabled.
100
+ cache : ${{ !contains(matrix.os, 'arm64') }}
96
101
install : >
97
102
make
98
103
dos2unix
Original file line number Diff line number Diff line change @@ -32,6 +32,10 @@ runners:
32
32
os : windows-2022-16core-64gb
33
33
<< : *base-job
34
34
35
+ - &job-windows-aarch64
36
+ os : windows-11-arm64-8core-32gb
37
+ << : *base-job
38
+
35
39
- &job-aarch64-linux
36
40
os : ubuntu-22.04-arm64-8core-32gb
37
41
@@ -80,17 +84,11 @@ envs:
80
84
# These jobs automatically inherit envs.pr, to avoid repeating
81
85
# it in each job definition.
82
86
pr :
83
- - image : mingw-check
84
- << : *job-linux-4c
85
- - image : mingw-check-tidy
86
- continue_on_error : true
87
- << : *job-linux-4c
88
- - image : x86_64-gnu-llvm-17
87
+ - image : aarch64-msvc
89
88
env :
90
- ENABLE_GCC_CODEGEN : " 1"
91
- << : *job-linux-16c
92
- - image : x86_64-gnu-tools
93
- << : *job-linux-16c
89
+ RUST_CONFIGURE_ARGS : --build=aarch64-pc-windows-msvc
90
+ SCRIPT : make ci-msvc
91
+ << : *job-windows-aarch64
94
92
95
93
# Jobs that run when you perform a try build (@bors try)
96
94
# These jobs automatically inherit envs.try, to avoid repeating
You can’t perform that action at this time.
0 commit comments