Skip to content

Commit

Permalink
GitHub-CI (MSYS2/MinGW): Build with UCRT64 instead of CLANG64.
Browse files Browse the repository at this point in the history
* .github/workflows/make.yaml (mingw): Run CI in the UCRT64 environment instead
of in the CLANG64 environment. That is closer to what will likely distributed
as version 9 of Octave for Windows.
  • Loading branch information
mmuetzel committed Dec 2, 2023
1 parent 3ba8df6 commit f05e744
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions .github/workflows/make.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ jobs:
matrix:
# For available GitHub-hosted runners, see: https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners
os: [windows-latest]
msystem: [MINGW64, CLANG64]
msystem: [MINGW64, UCRT64]
include:
- msystem: MINGW64
mingw-prefix: mingw64
Expand All @@ -683,20 +683,12 @@ jobs:
extra-config-flags: ""
ccache-max: 0.9G
- msystem: CLANG64
mingw-prefix: clang64
target-prefix: mingw-w64-clang-x86_64
cc: clang
# It looks like we and graphicsmagick++ aren't ready for C++17 yet.
cxx: "clang++ -std=gnu++14"
f77: flang
# Clang seems to require a different set of dllexport attributes than GCC.
# autoconf and libtool still need help to correctly invoke flang.
extra-config-flags:
--disable-lib-visibility-flags
--enable-fortran-calling-convention=gfortran
ac_cv_f77_compiler_gnu=yes
lt_cv_prog_gnu_ld=yes
ccache-max: 400M
mingw-prefix: ucrt64
target-prefix: mingw-w64-ucrt-x86_64
cc: gcc
cxx: g++
f77: gfortran
ccache-max: 0.9G

env:
CHERE_INVOKING: 1
Expand Down

0 comments on commit f05e744

Please sign in to comment.