Skip to content

Commit 408c311

Browse files
authored
Add macos-13, always upload artifact, no MD in enable-msvc [stable/0.60] (#101)
* Linux-ci add macos-13 build and always upload artifacts For windows-ci remove MD from enable-msvc * Update linux-ci.yml for new tools for macos
1 parent 3a03fa9 commit 408c311

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/linux-ci.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ jobs:
3030
build_static: false
3131
flags: CC=gcc-13 CXX=g++-13 OSX=13 ADD_CXXFLAGS=-Wl,-ld_classic
3232
download_requirements: brew install metis bash
33+
- os: macos-14
34+
arch: arm64
35+
build_static: false
36+
flags: CC=gcc-13 CXX=g++-13 OSX=14 ADD_CXXFLAGS=-Wl,-ld_classic
37+
download_requirements: brew install metis bash
3338
steps:
3439
- name: Checkout source
3540
uses: actions/checkout@v4
@@ -69,7 +74,7 @@ jobs:
6974
with:
7075
repository: coin-or-tools/platform-analysis-tools
7176
path: tools
72-
ref: 0.0.1
77+
ref: 0.0.2
7378
- name: Retrieve platform info
7479
run: |
7580
python3 -m venv venv
@@ -79,7 +84,6 @@ jobs:
7984
platform_str=`python3 tools/hsf_get_platform.py -b $buildtype`
8085
echo "platform_string=${platform_str}" >> $GITHUB_ENV
8186
- name: Upload Artifact
82-
if: ${{ github.event_name == 'pull_request'}}
8387
uses: actions/upload-artifact@v4
8488
with:
8589
name: ${{ github.event.repository.name }}-${{ env.platform_string }}.tar.gz

.github/workflows/windows-ci.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
ADD_BUILD_ARGS+=( --build=x86_64-w64-mingw32 --tests main --enable-relocatable )
103103
ADD_BUILD_ARGS+=( --verbosity 2 )
104104
[[ ${{ matrix.debug }} == "true" ]] && ADD_BUILD_ARGS+=( --enable-debug )
105-
[[ ${{ matrix.arch }} == "msvc" ]] && ADD_BUILD_ARGS+=( --enable-msvc=MD )
105+
[[ ${{ matrix.arch }} == "msvc" ]] && ADD_BUILD_ARGS+=( --enable-msvc )
106106
./coinbrew/coinbrew fetch ${{ github.event.repository.name }} --skip-update "${ADD_ARGS[@]}"
107107
./coinbrew/coinbrew build ${{ github.event.repository.name }} ${{ env.host_flag }} \
108108
"${ADD_ARGS[@]}" "${ADD_BUILD_ARGS[@]}"
@@ -127,7 +127,6 @@ jobs:
127127
shell: msys2 {0}
128128
if: ${{ matrix.arch != 'msvc' }}
129129
- name: Upload artifact
130-
if: ${{ github.event_name == 'pull_request'}}
131130
uses: actions/upload-artifact@v4
132131
with:
133132
name: ${{ github.event.repository.name }}-${{ env.package_suffix }}

0 commit comments

Comments
 (0)