Skip to content

Commit 8a4f525

Browse files
committed
Properly build with -MD on windows, update MacOS versions, and add arm64
1 parent feb32e2 commit 8a4f525

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/workflows/linux-ci.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,20 @@ jobs:
2222
build_static: [true, false]
2323
download_requirements: [sudo apt install -y -qq gfortran liblapack-dev libmetis-dev libnauty2-dev]
2424
include:
25-
- os: macos-12
25+
- os: macos-13
26+
arch: auto
2627
build_static: false
27-
flags: CC=clang OSX=12
28+
flags: CC=clang OSX=13
2829
download_requirements: brew install metis bash
29-
- os: macos-12
30+
- os: macos-13
31+
arch: auto
3032
build_static: false
31-
flags: CC=gcc-11 CXX=g++-11 OSX=12
33+
flags: CC=gcc-13 CXX=g++-13 OSX=13
3234
download_requirements: brew install metis bash
33-
- os: macos-12
35+
- os: macos-13
36+
arch: arm64
3437
build_static: false
35-
flags: CC=gcc-12 CXX=g++-12 OSX=12
38+
flags: CC=clang OSX=13
3639
download_requirements: brew install metis bash
3740
steps:
3841
- name: Checkout source

.github/workflows/windows-ci.yml

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

0 commit comments

Comments
 (0)