fix ci

sp1ff · Jan 13, 2024 · 22ab82f · 22ab82f
1 parent ab7d47f
commit 22ab82f
Showing 1 changed file with 6 additions and 68 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -107,8 +107,8 @@ jobs:
         set -e
 
     - name: Cache boost (Ubuntu)
-      # On Ubuntu, we install "pinned" & "latest" directly from the packages.
-      if: matrix.os == 'ubuntu-22.04' && matrix.boost == 'oldest'
+      # On Ubuntu, we install "latest" directly from the package repositories.
+      if: matrix.os == 'ubuntu-22.04' && matrix.boost != 'latest'
       id: cache-boost-ubuntu
       uses: actions/cache@v2
       with:
@@ -130,16 +130,8 @@ jobs:
         pwd
         sudo apt-get install -y libboost-all-dev
 
-    - name: Install boost (Ubuntu, pinned)
-      if: matrix.os == 'ubuntu-22.04' && matrix.boost == 'pinned'
-      shell: bash
-      run: |
-        set -x
-        pwd
-        sudo apt-get install -y libboost1.74-all-dev
-
-    - name: Get boost (Ubuntu, oldest)
-      if: matrix.os == 'ubuntu-22.04' && matrix.boost == 'oldest' && steps.cache-boost-ubuntu.outputs.cache-hit != 'true'
+    - name: Get boost (Ubuntu, non-latest)
+      if: matrix.os == 'ubuntu-22.04' && matrix.boost != 'latest' && steps.cache-boost-ubuntu.outputs.cache-hit != 'true'
       run: |
         set -ex
         pwd
@@ -330,62 +322,8 @@ jobs:
         eval "$(/usr/libexec/path_helper)"
         PATH="/usr/local/opt/bison/bin:/usr/local/opt/texinfo/bin:$PATH" make -j 4
 
-    - name: Patch boost binary dependencies (MacOS, oldest)
-      if: matrix.os == 'macos-12' && matrix.boost == 'oldest'
-      shell: bash
-      run: |
-        set -x
-        echo "===================================="
-        otool -L scribbu/.libs/libscribbu.dylib
-        echo "===================================="
-        there=$(cd boost_${{ matrix.boost-ver }}/installdir/lib; pwd)
-        echo "Changing the load location for boost libs to ${there}."
-        install_name_tool -change libboost_iostreams.dylib           ${there}/libboost_iostreams.dylib       scribbu/.libs/libscribbu.dylib
-        install_name_tool -change libboost_log.dylib                 ${there}/libboost_log.dylib             scribbu/.libs/libscribbu.dylib
-        install_name_tool -change libboost_program_options.dylib     ${there}/libboost_program_options.dylib scribbu/.libs/libscribbu.dylib
-        install_name_tool -change libboost_regex.dylib               ${there}/libboost_regex.dylib           scribbu/.libs/libscribbu.dylib
-        install_name_tool -change libboost_system.dylib              ${there}/libboost_system.dylib          scribbu/.libs/libscribbu.dylib
-        echo "===================================="
-        otool -L scribbu/.libs/libscribbu.dylib
-        echo "===================================="
-        echo "===================================="
-        otool -L src/.libs/scribbu
-        echo "===================================="
-        there=$(cd boost_${{ matrix.boost-ver }}/installdir/lib; pwd)
-        echo "Changing the load location for boost libs to ${there}."
-        install_name_tool -change libboost_iostreams.dylib           ${there}/libboost_iostreams.dylib       src/.libs/scribbu
-        install_name_tool -change libboost_log.dylib                 ${there}/libboost_log.dylib             src/.libs/scribbu
-        install_name_tool -change libboost_program_options.dylib     ${there}/libboost_program_options.dylib src/.libs/scribbu
-        install_name_tool -change libboost_regex.dylib               ${there}/libboost_regex.dylib           src/.libs/scribbu
-        install_name_tool -change libboost_system.dylib              ${there}/libboost_system.dylib          src/.libs/scribbu
-        there=$(cd scribbu/.libs; pwd)
-        echo "Changing the load location for scribbu lib to be ${there}."
-        install_name_tool -change /usr/local/lib/libscribbu.4.dylib ${there}/libscribbu.4.dylib src/.libs/scribbu
-        echo "===================================="
-        otool -L src/.libs/scribbu
-        src/.libs/scribbu --version
-        echo "===================================="
-        cd test && make unit
-        echo "===================================="
-        otool -L .libs/unit
-        echo "===================================="
-        there=$(cd ../boost_${{ matrix.boost-ver }}/installdir/lib; pwd)
-        echo "Changing the load location for boost libs to ${there}."
-        install_name_tool -change libboost_iostreams.dylib           ${there}/libboost_iostreams.dylib           .libs/unit
-        install_name_tool -change libboost_log.dylib                 ${there}/libboost_log.dylib                 .libs/unit
-        install_name_tool -change libboost_program_options.dylib     ${there}/libboost_program_options.dylib     .libs/unit
-        install_name_tool -change libboost_regex.dylib               ${there}/libboost_regex.dylib               .libs/unit
-        install_name_tool -change libboost_system.dylib              ${there}/libboost_system.dylib              .libs/unit
-        install_name_tool -change libboost_unit_test_framework.dylib ${there}/libboost_unit_test_framework.dylib .libs/unit
-        there=$(cd ../scribbu/.libs; pwd)
-        echo "Changing the load location for unit lib to be ${there}."
-        install_name_tool -change /usr/local/lib/libscribbu.4.dylib ${there}/libscribbu.4.dylib .libs/unit
-        echo "===================================="
-        otool -L .libs/unit
-        .libs/unit --help
-
-    - name: Patch boost binary dependencies (MacOS, non-oldest)
-      if: matrix.os == 'macos-12' && matrix.boost != 'oldest'
+    - name: Patch boost binary dependencies (MacOS)
+      if: matrix.os == 'macos-12'
       shell: bash
       run: |
         set -x