CI (MSYS2): Use LLVM Flang on CLANG64 runners. Add CLANG32 runner.

This commit is contained in:
Markus Mützel 2023-04-21 10:36:21 +02:00
parent 57256623f4
commit f334bd9041
1 changed files with 14 additions and 7 deletions

View File

@ -151,40 +151,47 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
msystem: [MINGW64, MINGW32, CLANG64] msystem: [MINGW64, MINGW32, CLANG64, CLANG32]
idx: [int32, int64] idx: [int32, int64]
build-type: [Release] build-type: [Release]
include: include:
- msystem: MINGW64 - msystem: MINGW64
idx: int32 idx: int32
target-prefix: mingw-w64-x86_64 target-prefix: mingw-w64-x86_64
fc-pkg: mingw-w64-x86_64-gcc-fortran fc-pkg: fc
- msystem: MINGW32 - msystem: MINGW32
idx: int32 idx: int32
target-prefix: mingw-w64-i686 target-prefix: mingw-w64-i686
fc-pkg: mingw-w64-i686-gcc-fortran fc-pkg: fc
- msystem: CLANG64 - msystem: CLANG64
idx: int32 idx: int32
target-prefix: mingw-w64-clang-x86_64 target-prefix: mingw-w64-clang-x86_64
fc-pkg: fc
- msystem: CLANG32
idx: int32
target-prefix: mingw-w64-clang-i686
fc-pkg: cc
c-lapack-flags: -DC_LAPACK=ON c-lapack-flags: -DC_LAPACK=ON
- msystem: MINGW64 - msystem: MINGW64
idx: int64 idx: int64
idx64-flags: -DBINARY=64 -DINTERFACE64=1 idx64-flags: -DBINARY=64 -DINTERFACE64=1
target-prefix: mingw-w64-x86_64 target-prefix: mingw-w64-x86_64
fc-pkg: mingw-w64-x86_64-gcc-fortran fc-pkg: fc
- msystem: CLANG64 - msystem: CLANG64
idx: int64 idx: int64
idx64-flags: -DBINARY=64 -DINTERFACE64=1 idx64-flags: -DBINARY=64 -DINTERFACE64=1
target-prefix: mingw-w64-clang-x86_64 target-prefix: mingw-w64-clang-x86_64
c-lapack-flags: -DC_LAPACK=ON fc-pkg: fc
- msystem: MINGW64 - msystem: MINGW64
idx: int32 idx: int32
target-prefix: mingw-w64-x86_64 target-prefix: mingw-w64-x86_64
fc-pkg: mingw-w64-x86_64-gcc-fortran fc-pkg: fc
build-type: None build-type: None
exclude: exclude:
- msystem: MINGW32 - msystem: MINGW32
idx: int64 idx: int64
- msystem: CLANG32
idx: int64
defaults: defaults:
run: run:
@ -209,7 +216,7 @@ jobs:
install: >- install: >-
base-devel base-devel
${{ matrix.target-prefix }}-cc ${{ matrix.target-prefix }}-cc
${{ matrix.fc-pkg }} ${{ matrix.target-prefix }}-${{ matrix.fc-pkg }}
${{ matrix.target-prefix }}-cmake ${{ matrix.target-prefix }}-cmake
${{ matrix.target-prefix }}-ninja ${{ matrix.target-prefix }}-ninja
${{ matrix.target-prefix }}-ccache ${{ matrix.target-prefix }}-ccache