From f114648417a89c98d8124f24512ae61582d75c5a Mon Sep 17 00:00:00 2001
From: Suresh Bolusani <bolusani@zib.de>
Date: Fri, 26 Jan 2024 16:29:07 +0100
Subject: [PATCH] Deactivate Ubuntu test, add new Mac test for BOOST ON

---
 .github/workflows/integration-test.yml | 162 +++++++++++++++++--------
 1 file changed, 110 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index d7023a5..e13e2fb 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -12,57 +12,57 @@ on:
 
 jobs:
 
-  ubuntu-test:
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: true
-      matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Cache dependencies (soplex)
-        id: cache-soplex
-        uses: actions/cache@v3
-        with:
-          path: |
-            ${{ runner.workspace }}/PySoPlex
-          key: ${{ runner.os }}-soplex-${{ env.version }}-${{ hashFiles('**/lockfiles') }}
-          restore-keys: |
-            ${{ runner.os }}-soplex-${{ env.version }}-
-
-      - name: Install dependencies (soplex)
-        if: steps.cache-soplex.outputs.cache-hit != 'true'
-        run: |
-          sudo apt-get update
-          sudo apt-get install git cmake gcc g++
-          git clone -b bugfix-70 https://github.com/scipopt/soplex.git
-          cd soplex
-          mkdir build
-          cd build
-          cmake ../ -DCMAKE_INSTALL_PREFIX=./install
-          make -j
-          make install
-
-      - name: Setup python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Prepare python environment
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install cython wheel pytest
-
-      - name: Install PySoPlex
-        run: |
-          export SOPLEX_DIR=${{ runner.workspace }}/PySoPlex/soplex/build/install
-          python -m pip install .
-
-      - name: Run pysoplex tests
-        run: |
-          export SOPLEX_DIR=${{ runner.workspace }}/PySoPlex/soplex/build/install
-          py.test
+#  ubuntu-test:
+#    runs-on: ubuntu-20.04
+#    strategy:
+#      fail-fast: true
+#      matrix:
+#        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+#    steps:
+#      - uses: actions/checkout@v3
+#
+#      - name: Cache dependencies (soplex)
+#        id: cache-soplex
+#        uses: actions/cache@v3
+#        with:
+#          path: |
+#            ${{ runner.workspace }}/PySoPlex
+#          key: ${{ runner.os }}-soplex-${{ env.version }}-${{ hashFiles('**/lockfiles') }}
+#          restore-keys: |
+#            ${{ runner.os }}-soplex-${{ env.version }}-
+#
+#      - name: Install dependencies (soplex)
+#        if: steps.cache-soplex.outputs.cache-hit != 'true'
+#        run: |
+#          sudo apt-get update
+#          sudo apt-get install git cmake gcc g++
+#          git clone -b bugfix-70 https://github.com/scipopt/soplex.git
+#          cd soplex
+#          mkdir build
+#          cd build
+#          cmake ../ -DCMAKE_INSTALL_PREFIX=./install
+#          make -j
+#          make install
+#
+#      - name: Setup python ${{ matrix.python-version }}
+#        uses: actions/setup-python@v4
+#        with:
+#          python-version: ${{ matrix.python-version }}
+#
+#      - name: Prepare python environment
+#        run: |
+#          python -m pip install --upgrade pip
+#          python -m pip install cython wheel pytest
+#
+#      - name: Install PySoPlex
+#        run: |
+#          export SOPLEX_DIR=${{ runner.workspace }}/PySoPlex/soplex/build/install
+#          python -m pip install .
+#
+#      - name: Run pysoplex tests
+#        run: |
+#          export SOPLEX_DIR=${{ runner.workspace }}/PySoPlex/soplex/build/install
+#          py.test
 
 #  windows-test:
 #    runs-on: windows-latest
@@ -107,7 +107,7 @@ jobs:
 #          $Env:PATH = "${{ runner.workspace }}\PySoPlex\soplex\build\install\bin;%PATH%"
 #          py.test
 
-  mac-test:
+  mac-test-boost-off:
     runs-on: macos-latest
     strategy:
       matrix:
@@ -164,6 +164,64 @@ jobs:
           export DYLD_LIBRARY_PATH=${{ runner.workspace }}/PySoPlex/soplex/build/install/lib:${DYLD_LIBRARY_PATH}
           py.test
 
+
+  mac-test-boost-on:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        python-version: ["3.10"]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Cache dependencies (soplex)
+        id: cache-soplex
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ runner.workspace }}/PySoPlex
+            ~/Library/Caches/Homebrew/git--*
+              /usr/local/opt/git*
+            ~/Library/Caches/Homebrew/downloads/*--git-*
+            ~/Library/Caches/Homebrew/cmake--*
+              /usr/local/opt/cmake*
+            ~/Library/Caches/Homebrew/downloads/*--cmake-*
+          key: ${{ runner.os }}-soplex-${{ env.version }}-${{ hashFiles('**/lockfiles') }}
+          restore-keys: |
+            ${{ runner.os }}-soplex-${{ env.version }}-
+
+      - name: Install dependencies (soplex)
+        if: steps.cache-soplex.outputs.cache-hit != 'true'
+        run: |
+          brew install git cmake boost
+          git clone -b bugfix-70 https://github.com/scipopt/soplex.git
+          cd soplex
+          mkdir build
+          cd build
+          cmake ../ -DCMAKE_INSTALL_PREFIX=./install
+          make -j
+          make install
+
+      - name: Setup python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Prepare python environment
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install cython wheel pytest
+
+      - name: Install PySoPlex
+        run: |
+          export SOPLEX_DIR=${{ runner.workspace }}/PySoPlex/soplex/build/install
+          python -m pip install .
+
+      - name: Run pysoplex tests
+        run: |
+          export SOPLEX_DIR=${{ runner.workspace }}/PySoPlex/soplex/build/install
+          export DYLD_LIBRARY_PATH=${{ runner.workspace }}/PySoPlex/soplex/build/install/lib:${DYLD_LIBRARY_PATH}
+          py.test
+
 #  ### if you need valgrind on mac, you can install it via
 #  # brew tap LouisBrunner/valgrind
 #  # brew install --HEAD LouisBrunner/valgrind/valgrind