Skip to content

Commit f334bd9

Browse files
committed
CI (MSYS2): Use LLVM Flang on CLANG64 runners. Add CLANG32 runner.
1 parent 5725662 commit f334bd9

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

.github/workflows/dynamic_arch.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,40 +151,47 @@ jobs:
151151
strategy:
152152
fail-fast: false
153153
matrix:
154-
msystem: [MINGW64, MINGW32, CLANG64]
154+
msystem: [MINGW64, MINGW32, CLANG64, CLANG32]
155155
idx: [int32, int64]
156156
build-type: [Release]
157157
include:
158158
- msystem: MINGW64
159159
idx: int32
160160
target-prefix: mingw-w64-x86_64
161-
fc-pkg: mingw-w64-x86_64-gcc-fortran
161+
fc-pkg: fc
162162
- msystem: MINGW32
163163
idx: int32
164164
target-prefix: mingw-w64-i686
165-
fc-pkg: mingw-w64-i686-gcc-fortran
165+
fc-pkg: fc
166166
- msystem: CLANG64
167167
idx: int32
168168
target-prefix: mingw-w64-clang-x86_64
169+
fc-pkg: fc
170+
- msystem: CLANG32
171+
idx: int32
172+
target-prefix: mingw-w64-clang-i686
173+
fc-pkg: cc
169174
c-lapack-flags: -DC_LAPACK=ON
170175
- msystem: MINGW64
171176
idx: int64
172177
idx64-flags: -DBINARY=64 -DINTERFACE64=1
173178
target-prefix: mingw-w64-x86_64
174-
fc-pkg: mingw-w64-x86_64-gcc-fortran
179+
fc-pkg: fc
175180
- msystem: CLANG64
176181
idx: int64
177182
idx64-flags: -DBINARY=64 -DINTERFACE64=1
178183
target-prefix: mingw-w64-clang-x86_64
179-
c-lapack-flags: -DC_LAPACK=ON
184+
fc-pkg: fc
180185
- msystem: MINGW64
181186
idx: int32
182187
target-prefix: mingw-w64-x86_64
183-
fc-pkg: mingw-w64-x86_64-gcc-fortran
188+
fc-pkg: fc
184189
build-type: None
185190
exclude:
186191
- msystem: MINGW32
187192
idx: int64
193+
- msystem: CLANG32
194+
idx: int64
188195

189196
defaults:
190197
run:
@@ -209,7 +216,7 @@ jobs:
209216
install: >-
210217
base-devel
211218
${{ matrix.target-prefix }}-cc
212-
${{ matrix.fc-pkg }}
219+
${{ matrix.target-prefix }}-${{ matrix.fc-pkg }}
213220
${{ matrix.target-prefix }}-cmake
214221
${{ matrix.target-prefix }}-ninja
215222
${{ matrix.target-prefix }}-ccache

0 commit comments

Comments
 (0)