From 847ca629e6346d50b745deac8ed341735e904014 Mon Sep 17 00:00:00 2001
From: Suresh Bolusani <bolusani@zib.de>
Date: Fri, 26 Jan 2024 16:08:58 +0100
Subject: [PATCH] Activate Mac code for testing

---
 .github/workflows/integration-test.yml | 140 ++++++++++++-------------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index e97882d..faee5da 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -64,24 +64,84 @@ jobs:
 #          export SOPLEX_DIR=${{ runner.workspace }}/PySoPlex/soplex/build/install
 #          py.test
 
-  windows-test:
-    runs-on: windows-latest
+#  windows-test:
+#    runs-on: windows-latest
+#    strategy:
+#      matrix:
+#        python-version: ["3.10", "3.11"]
+#    steps:
+#      - uses: actions/checkout@v3
+#
+#      - name: Install dependencies (soplex)
+#        shell: powershell
+#        run: |
+#          git clone -b bugfix-70 https://github.com/scipopt/soplex.git
+#          cd soplex
+#          mkdir build
+#          cd build
+#          cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DMT=on ..
+#          cmake --build . --config Release
+#          cmake --install .
+#
+#      - name: Setup python ${{ matrix.python-version }}
+#        uses: actions/setup-python@v4
+#        with:
+#          python-version: ${{ matrix.python-version }}
+#
+#      - name: Prepare python environment
+#        shell: powershell
+#        run: |
+#          python -m pip install --upgrade pip
+#          python -m pip install cython wheel pytest
+#          which python
+#
+#      - name: Install PySoPlex
+#        shell: powershell
+#        run: |
+#          $Env:SOPLEX_DIR = "${{ runner.workspace }}\PySoPlex\soplex\build\install"
+#          python -m pip install .
+#
+#      - name: Run pysoplex tests
+#        shell: powershell
+#        run: |
+#          $Env:PATH = "${{ runner.workspace }}\PySoPlex\soplex\build\install\bin;%PATH%"
+#          py.test
+
+  mac-test:
+    runs-on: macos-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11"]
+        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)
-        shell: powershell
+        if: steps.cache-soplex.outputs.cache-hit != 'true'
         run: |
+          brew install git cmake
           git clone -b bugfix-70 https://github.com/scipopt/soplex.git
           cd soplex
           mkdir build
           cd build
-          cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DMT=on ..
-          cmake --build . --config Release
-          cmake --install .
+          cmake ../ -DCMAKE_INSTALL_PREFIX=./install
+          make -j
+          make install
 
       - name: Setup python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
@@ -89,81 +149,21 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Prepare python environment
-        shell: powershell
         run: |
           python -m pip install --upgrade pip
           python -m pip install cython wheel pytest
-          which python
 
       - name: Install PySoPlex
-        shell: powershell
         run: |
-          $Env:SOPLEX_DIR = "${{ runner.workspace }}\PySoPlex\soplex\build\install"
+          export SOPLEX_DIR=${{ runner.workspace }}/PySoPlex/soplex/build/install
           python -m pip install .
 
       - name: Run pysoplex tests
-        shell: powershell
         run: |
-          $Env:PATH = "${{ runner.workspace }}\PySoPlex\soplex\build\install\bin;%PATH%"
+          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
 
-#  mac-test:
-#    runs-on: macos-latest
-#    strategy:
-#      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
-#            ~/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
-#          git clone -b C_interface_update 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