diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42dd00616..23689d3ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,7 +108,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-14-large] + os: [macos-14-large, macos-latest] steps: - name: Setup cmake @@ -124,15 +124,24 @@ jobs: echo "GTEST=$GTEST" >> $GITHUB_ENV SSCDIR=$GITHUB_WORKSPACE/ssc echo "SSCDIR=$SSCDIR" >> $GITHUB_ENV - ORTOOLSDIR=$GITHUB_WORKSPACE/or-tools_x86_64_macOS-15.5_cpp_v$ORTOOLS_VER.$ORTOOLS_RELEASE - echo "ORTOOLSDIR=$ORTOOLSDIR" >> $GITHUB_ENV - - name: Download OR-Tools - if: steps.cached-ortools-restore.outputs.cache-hit != 'true' + - name: Download OR-Tools x86 + if: steps.cached-ortools-restore.outputs.cache-hit != 'true' && matrix.os == 'macos-14-large' shell: bash run: | curl -L https://github.com/google/or-tools/releases/download/v$ORTOOLS_VER/or-tools_x86_64_macOS-15.5_cpp_v$ORTOOLS_VER.$ORTOOLS_RELEASE.tar.gz -o or-tools-$ORTOOLS_VER.tar.gz tar xvzf or-tools-$ORTOOLS_VER.tar.gz + ORTOOLSDIR=$GITHUB_WORKSPACE/or-tools_x86_64_macOS-15.5_cpp_v$ORTOOLS_VER.$ORTOOLS_RELEASE + echo "ORTOOLSDIR=$ORTOOLSDIR" >> $GITHUB_ENV + + - name: Download OR-Tools x64 + if: steps.cached-ortools-restore.outputs.cache-hit != 'true' && matrix.os == 'macos-latest' + shell: bash + run: | + curl -L https://github.com/google/or-tools/releases/download/v$ORTOOLS_VER/or-tools_arm64_macOS-15.5_cpp_v$ORTOOLS_VER.$ORTOOLS_RELEASE.tar.gz -o or-tools-$ORTOOLS_VER.tar.gz + tar xvzf or-tools-$ORTOOLS_VER.tar.gz + ORTOOLSDIR=$GITHUB_WORKSPACE/or-tools_arm64_macOS-15.5_cpp_v$ORTOOLS_VER.$ORTOOLS_RELEASE + echo "ORTOOLSDIR=$ORTOOLSDIR" >> $GITHUB_ENV - name: Get cached GTest uses: actions/cache@v4