Update Mac tests and change branch for testing

scipopt · Jan 29, 2024 · 961bdcc · 961bdcc
1 parent baae6bf
commit 961bdcc
Showing 1 changed file with 116 additions and 6 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -7,8 +7,9 @@ env:
 on:
   push:
     branches:
-      - '**'
+      - 'master'
   pull_request:
+      - 'master'
 
 jobs:
 
@@ -36,7 +37,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install git cmake gcc g++
-          git clone -b bugfix-70 https://github.com/scipopt/soplex.git
+          git clone -b fix-mpfr-no-boost https://github.com/scipopt/soplex.git
           cd soplex
           mkdir build
           cd build
@@ -88,7 +89,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install git cmake gcc g++ libboost-all-dev
-          git clone -b bugfix-70 https://github.com/scipopt/soplex.git
+          git clone -b fix-mpfr-no-boost https://github.com/scipopt/soplex.git
           cd soplex
           mkdir build
           cd build
@@ -116,6 +117,59 @@ jobs:
           export SOPLEX_DIR=${{ runner.workspace }}/PySoPlex/soplex/build/install
           py.test
 
+  ubuntu-test-boost-auto:
+    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 fix-mpfr-no-boost 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
+
+## Following Windows test produces linking errors; so turned it off for now
 #  windows-test-boost-off:
 #    runs-on: windows-latest
 #    strategy:
@@ -188,7 +242,7 @@ jobs:
         if: steps.cache-soplex.outputs.cache-hit != 'true'
         run: |
           brew install git cmake
-          git clone -b bugfix-70 https://github.com/scipopt/soplex.git
+          git clone -b fix-mpfr-no-boost https://github.com/scipopt/soplex.git
           cd soplex
           mkdir build
           cd build
@@ -217,7 +271,6 @@ 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:
@@ -246,7 +299,64 @@ jobs:
         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
+          git clone -b fix-mpfr-no-boost https://github.com/scipopt/soplex.git
+          cd soplex
+          mkdir build
+          cd build
+          cmake ../ -DMPFR=On -DBOOST=On -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
+
+  mac-test-boost-auto:
+    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 fix-mpfr-no-boost https://github.com/scipopt/soplex.git
           cd soplex
           mkdir build
           cd build