Update build.yml

fontanf · Jul 13, 2024 · eb149b2 · eb149b2
1 parent bb52164
commit eb149b2
Showing 1 changed file with 5 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
         python-version: ["3.8"]
 
     env:
@@ -27,6 +27,10 @@ jobs:
     - name: Install nauty
       run: sudo apt-get install -y libnauty2-dev
       if: matrix.os == 'ubuntu-latest'
+    - name: Install CLP (MacOS)
+      run: |
+        brew install clp@1.17.9
+      if: ${{ (matrix.os == 'macos-13') || (matrix.os == 'macos-latest') }}
     - name: Download data
       run: |
         python3 -m pip install gdown
@@ -36,17 +40,6 @@ jobs:
         cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release --parallel
         cmake --install build --config Release --prefix install
-    - name: Copy CLP libraries (Darwin)
-      run: |
-        mkdir -p "/Users/runner/work/Osi/Osi/dist/lib"
-        cp -rf "${GITHUB_WORKSPACE}/build/_deps/mathoptsolverscmake-build/extern/Osi-prefix/src/Osi/lib/" "/Users/runner/work/Osi/Osi/dist/lib"
-        mkdir -p "/Users/runner/work/CoinUtils/CoinUtils/dist/lib"
-        cp -rf "${GITHUB_WORKSPACE}/build/_deps/mathoptsolverscmake-build/extern/CoinUtils-prefix/src/CoinUtils/lib/" "/Users/runner/work/CoinUtils/CoinUtils/dist/lib"
-        mkdir -p "/Users/runner/work/Clp/Clp/dist/lib"
-        cp -rf "${GITHUB_WORKSPACE}/build/_deps/mathoptsolverscmake-build/extern/Clp-prefix/src/Clp/lib/" "/Users/runner/work/Clp/Clp/dist/lib"
-        mkdir -p "/Users/runner/work/Cbc/Cbc/dist/lib"
-        cp -rf "${GITHUB_WORKSPACE}/build/_deps/mathoptsolverscmake-build/extern/Cbc-prefix/src/Cbc/lib/" "/Users/runner/work/Cbc/Cbc/dist/lib"
-      if: matrix.os == 'macos-latest'
     - name: Run tests
       run: python3 -u scripts/run_tests.py test_results
     - name: Checkout main branch
@@ -59,17 +52,6 @@ jobs:
         cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release --parallel
         cmake --install build --config Release --prefix install
-    - name: Copy CLP libraries (Darwin)
-      run: |
-        mkdir -p "/Users/runner/work/Osi/Osi/dist/lib"
-        cp -rf "${GITHUB_WORKSPACE}/build/_deps/mathoptsolverscmake-build/extern/Osi-prefix/src/Osi/lib/" "/Users/runner/work/Osi/Osi/dist/lib"
-        mkdir -p "/Users/runner/work/CoinUtils/CoinUtils/dist/lib"
-        cp -rf "${GITHUB_WORKSPACE}/build/_deps/mathoptsolverscmake-build/extern/CoinUtils-prefix/src/CoinUtils/lib/" "/Users/runner/work/CoinUtils/CoinUtils/dist/lib"
-        mkdir -p "/Users/runner/work/Clp/Clp/dist/lib"
-        cp -rf "${GITHUB_WORKSPACE}/build/_deps/mathoptsolverscmake-build/extern/Clp-prefix/src/Clp/lib/" "/Users/runner/work/Clp/Clp/dist/lib"
-        mkdir -p "/Users/runner/work/Cbc/Cbc/dist/lib"
-        cp -rf "${GITHUB_WORKSPACE}/build/_deps/mathoptsolverscmake-build/extern/Cbc-prefix/src/Cbc/lib/" "/Users/runner/work/Cbc/Cbc/dist/lib"
-      if: matrix.os == 'macos-latest'
     - name: Run tests
       run: python3 -u scripts/run_tests.py test_results_ref
     - name: Process tests