Skip to content

Commit 741e583

Browse files
committed
Properly build with -MD on windows, update MacOS versions, and add arm64
1 parent 7dbcb93 commit 741e583

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/workflows/linux-ci.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,20 @@ jobs:
2323
flags: [ADD_CXXFLAGS=-fvisibility=hidden]
2424
download_requirements: [sudo apt install -y -qq gfortran liblapack-dev libmetis-dev libnauty2-dev]
2525
include:
26-
- os: macos-12
26+
- os: macos-13
27+
arch: auto
2728
build_static: false
28-
flags: CC=clang OSX=12
29+
flags: CC=clang OSX=13
2930
download_requirements: brew install metis bash
30-
- os: macos-12
31+
- os: macos-13
32+
arch: auto
3133
build_static: false
32-
flags: CC=gcc-11 CXX=g++-11 OSX=12
34+
flags: CC=gcc-13 CXX=g++-13 OSX=13
3335
download_requirements: brew install metis bash
34-
- os: macos-12
36+
- os: macos-13
37+
arch: arm64
3538
build_static: false
36-
flags: CC=gcc-12 CXX=g++-12 OSX=12
39+
flags: CC=clang OSX=13
3740
download_requirements: brew install metis bash
3841
steps:
3942
- name: Checkout source

.github/workflows/windows-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
ADD_BUILD_ARGS+=( --build=x86_64-w64-mingw32 --tests main --enable-relocatable )
108108
ADD_BUILD_ARGS+=( --verbosity 2 )
109109
[[ ${{ matrix.debug }} == "true" ]] && ADD_BUILD_ARGS+=( --enable-debug )
110-
[[ ${{ matrix.arch }} == "msvc" ]] && ADD_BUILD_ARGS+=( --enable-msvc )
110+
[[ ${{ matrix.arch }} == "msvc" ]] && ADD_BUILD_ARGS+=( --enable-msvc=MD )
111111
./coinbrew/coinbrew fetch ${{ github.event.repository.name }} --skip-update "${ADD_ARGS[@]}"
112112
./coinbrew/coinbrew build ${{ github.event.repository.name }} ${{ env.host_flag }} \
113113
"${ADD_ARGS[@]}" "${ADD_BUILD_ARGS[@]}"

0 commit comments

Comments
 (0)