diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index d4656a44..aa70bac1 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -30,6 +30,11 @@ jobs: build_static: false flags: CC=gcc-13 CXX=g++-13 OSX=13 ADD_CXXFLAGS=-Wl,-ld_classic download_requirements: brew install metis bash + - os: macos-14 + arch: arm64 + build_static: false + flags: CC=gcc-13 CXX=g++-13 OSX=14 ADD_CXXFLAGS=-Wl,-ld_classic + download_requirements: brew install metis bash steps: - name: Checkout source uses: actions/checkout@v4 @@ -69,7 +74,7 @@ jobs: with: repository: coin-or-tools/platform-analysis-tools path: tools - ref: 0.0.1 + ref: 0.0.2 - name: Retrieve platform info run: | python3 -m venv venv @@ -79,7 +84,6 @@ jobs: platform_str=`python3 tools/hsf_get_platform.py -b $buildtype` echo "platform_string=${platform_str}" >> $GITHUB_ENV - name: Upload Artifact - if: ${{ github.event_name == 'pull_request'}} uses: actions/upload-artifact@v4 with: name: ${{ github.event.repository.name }}-${{ env.platform_string }}.tar.gz diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 66420ae3..7ff1c551 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -102,7 +102,7 @@ jobs: ADD_BUILD_ARGS+=( --build=x86_64-w64-mingw32 --tests main --enable-relocatable ) ADD_BUILD_ARGS+=( --verbosity 2 ) [[ ${{ matrix.debug }} == "true" ]] && ADD_BUILD_ARGS+=( --enable-debug ) - [[ ${{ matrix.arch }} == "msvc" ]] && ADD_BUILD_ARGS+=( --enable-msvc=MD ) + [[ ${{ matrix.arch }} == "msvc" ]] && ADD_BUILD_ARGS+=( --enable-msvc ) ./coinbrew/coinbrew fetch ${{ github.event.repository.name }} --skip-update "${ADD_ARGS[@]}" ./coinbrew/coinbrew build ${{ github.event.repository.name }} ${{ env.host_flag }} \ "${ADD_ARGS[@]}" "${ADD_BUILD_ARGS[@]}" @@ -127,7 +127,6 @@ jobs: shell: msys2 {0} if: ${{ matrix.arch != 'msvc' }} - name: Upload artifact - if: ${{ github.event_name == 'pull_request'}} uses: actions/upload-artifact@v4 with: name: ${{ github.event.repository.name }}-${{ env.package_suffix }}