Skip to content

Commit 22ab82f

Browse files
committed
fix ci
1 parent ab7d47f commit 22ab82f

File tree

1 file changed

+6
-68
lines changed

1 file changed

+6
-68
lines changed

.github/workflows/ci.yml

+6-68
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ jobs:
107107
set -e
108108
109109
- name: Cache boost (Ubuntu)
110-
# On Ubuntu, we install "pinned" & "latest" directly from the packages.
111-
if: matrix.os == 'ubuntu-22.04' && matrix.boost == 'oldest'
110+
# On Ubuntu, we install "latest" directly from the package repositories.
111+
if: matrix.os == 'ubuntu-22.04' && matrix.boost != 'latest'
112112
id: cache-boost-ubuntu
113113
uses: actions/cache@v2
114114
with:
@@ -130,16 +130,8 @@ jobs:
130130
pwd
131131
sudo apt-get install -y libboost-all-dev
132132
133-
- name: Install boost (Ubuntu, pinned)
134-
if: matrix.os == 'ubuntu-22.04' && matrix.boost == 'pinned'
135-
shell: bash
136-
run: |
137-
set -x
138-
pwd
139-
sudo apt-get install -y libboost1.74-all-dev
140-
141-
- name: Get boost (Ubuntu, oldest)
142-
if: matrix.os == 'ubuntu-22.04' && matrix.boost == 'oldest' && steps.cache-boost-ubuntu.outputs.cache-hit != 'true'
133+
- name: Get boost (Ubuntu, non-latest)
134+
if: matrix.os == 'ubuntu-22.04' && matrix.boost != 'latest' && steps.cache-boost-ubuntu.outputs.cache-hit != 'true'
143135
run: |
144136
set -ex
145137
pwd
@@ -330,62 +322,8 @@ jobs:
330322
eval "$(/usr/libexec/path_helper)"
331323
PATH="/usr/local/opt/bison/bin:/usr/local/opt/texinfo/bin:$PATH" make -j 4
332324
333-
- name: Patch boost binary dependencies (MacOS, oldest)
334-
if: matrix.os == 'macos-12' && matrix.boost == 'oldest'
335-
shell: bash
336-
run: |
337-
set -x
338-
echo "===================================="
339-
otool -L scribbu/.libs/libscribbu.dylib
340-
echo "===================================="
341-
there=$(cd boost_${{ matrix.boost-ver }}/installdir/lib; pwd)
342-
echo "Changing the load location for boost libs to ${there}."
343-
install_name_tool -change libboost_iostreams.dylib ${there}/libboost_iostreams.dylib scribbu/.libs/libscribbu.dylib
344-
install_name_tool -change libboost_log.dylib ${there}/libboost_log.dylib scribbu/.libs/libscribbu.dylib
345-
install_name_tool -change libboost_program_options.dylib ${there}/libboost_program_options.dylib scribbu/.libs/libscribbu.dylib
346-
install_name_tool -change libboost_regex.dylib ${there}/libboost_regex.dylib scribbu/.libs/libscribbu.dylib
347-
install_name_tool -change libboost_system.dylib ${there}/libboost_system.dylib scribbu/.libs/libscribbu.dylib
348-
echo "===================================="
349-
otool -L scribbu/.libs/libscribbu.dylib
350-
echo "===================================="
351-
echo "===================================="
352-
otool -L src/.libs/scribbu
353-
echo "===================================="
354-
there=$(cd boost_${{ matrix.boost-ver }}/installdir/lib; pwd)
355-
echo "Changing the load location for boost libs to ${there}."
356-
install_name_tool -change libboost_iostreams.dylib ${there}/libboost_iostreams.dylib src/.libs/scribbu
357-
install_name_tool -change libboost_log.dylib ${there}/libboost_log.dylib src/.libs/scribbu
358-
install_name_tool -change libboost_program_options.dylib ${there}/libboost_program_options.dylib src/.libs/scribbu
359-
install_name_tool -change libboost_regex.dylib ${there}/libboost_regex.dylib src/.libs/scribbu
360-
install_name_tool -change libboost_system.dylib ${there}/libboost_system.dylib src/.libs/scribbu
361-
there=$(cd scribbu/.libs; pwd)
362-
echo "Changing the load location for scribbu lib to be ${there}."
363-
install_name_tool -change /usr/local/lib/libscribbu.4.dylib ${there}/libscribbu.4.dylib src/.libs/scribbu
364-
echo "===================================="
365-
otool -L src/.libs/scribbu
366-
src/.libs/scribbu --version
367-
echo "===================================="
368-
cd test && make unit
369-
echo "===================================="
370-
otool -L .libs/unit
371-
echo "===================================="
372-
there=$(cd ../boost_${{ matrix.boost-ver }}/installdir/lib; pwd)
373-
echo "Changing the load location for boost libs to ${there}."
374-
install_name_tool -change libboost_iostreams.dylib ${there}/libboost_iostreams.dylib .libs/unit
375-
install_name_tool -change libboost_log.dylib ${there}/libboost_log.dylib .libs/unit
376-
install_name_tool -change libboost_program_options.dylib ${there}/libboost_program_options.dylib .libs/unit
377-
install_name_tool -change libboost_regex.dylib ${there}/libboost_regex.dylib .libs/unit
378-
install_name_tool -change libboost_system.dylib ${there}/libboost_system.dylib .libs/unit
379-
install_name_tool -change libboost_unit_test_framework.dylib ${there}/libboost_unit_test_framework.dylib .libs/unit
380-
there=$(cd ../scribbu/.libs; pwd)
381-
echo "Changing the load location for unit lib to be ${there}."
382-
install_name_tool -change /usr/local/lib/libscribbu.4.dylib ${there}/libscribbu.4.dylib .libs/unit
383-
echo "===================================="
384-
otool -L .libs/unit
385-
.libs/unit --help
386-
387-
- name: Patch boost binary dependencies (MacOS, non-oldest)
388-
if: matrix.os == 'macos-12' && matrix.boost != 'oldest'
325+
- name: Patch boost binary dependencies (MacOS)
326+
if: matrix.os == 'macos-12'
389327
shell: bash
390328
run: |
391329
set -x

0 commit comments

Comments
 (0)