Skip to content

Commit e5ffc6c

Browse files
committed
ci: fix, improve arm support in if cases and in actions, remove unused config option
1 parent 9cb41f3 commit e5ffc6c

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,13 @@ jobs:
7979
os: ubuntu
8080
os-version: 24.04-arm
8181
use-clang: false
82-
arm: true
8382
shell: bash
8483
fatal_warnings: true
8584

8685
- name: Linux
8786
os: ubuntu
8887
os-version: 24.04
8988
use-clang: false
90-
arm: false
9189
shell: bash
9290
fatal_warnings: true
9391

@@ -96,7 +94,6 @@ jobs:
9694
os-version: 24.04
9795
use-clang: true
9896
use-clang_stdlib: false
99-
arm: false
10097
shell: bash
10198
fatal_warnings: true
10299

@@ -105,21 +102,18 @@ jobs:
105102
os-version: 24.04
106103
use-clang: true
107104
use-clang_stdlib: true
108-
arm: false
109105
shell: bash
110106
fatal_warnings: true
111107

112108
- name: MacOS
113109
os: macos
114110
os-version: 13
115-
arm: false
116111
shell: bash
117112
fatal_warnings: true
118113

119114
- name: MacOS (Arm64)
120115
os: macos
121116
os-version: 15
122-
arm: true
123117
shell: bash
124118
fatal_warnings: true
125119

@@ -136,7 +130,7 @@ jobs:
136130
if: matrix.config.os == 'windows' && matrix.config.environment == 'msvc'
137131
uses: TheMrMilchmann/setup-msvc-dev@v3
138132
with:
139-
arch: x64
133+
arch: ${{matrix.config.os-version == '11-arm' && 'x64' || 'x64'}} # note this action doesn't really support arm64 yet, but it works like this already (by accident)
140134
toolset: '14.43'
141135

142136
- name: Setup MSYS2 (Windows)
@@ -203,7 +197,7 @@ jobs:
203197
uses: egor-tensin/setup-gcc@v1
204198
with:
205199
version: 14
206-
platform: x64
200+
platform: ${{matrix.config.os-version == '24.04-arm' && 'x64' || 'x64'}} # note this action doesn't really support arm64 yet, but it works like this already (by accident)
207201

208202
- name: Unbreak Python in GHA (MacOS 13 image)
209203
if: matrix.config.os == 'macos' && matrix.config.os-version == 13

0 commit comments

Comments
 (0)