diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5006d25..b4e0cdf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,14 +77,14 @@ jobs: packager: "apt" packages: "" - - os: macos-13 + - os: macos-latest cxx: "clang++" link: "dynamic" optimization: "size" assert: "ndebug" coverage: "nocov" boost: "--build-boost" - icu: "--with-icu" + icu: "" zmq: "--build-zmq" cc: "clang" flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" @@ -92,20 +92,20 @@ jobs: packager: "brew" packages: "icu4c" - - os: macos-13 + - os: macos-latest cxx: "clang++" link: "static" optimization: "size" assert: "ndebug" coverage: "nocov" boost: "--build-boost" - icu: "--build-icu --with-icu" + icu: "" zmq: "--build-zmq" cc: "clang" flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "--enable-isystem" packager: "brew" - packages: "" + packages: "icu4c" runs-on: ${{ matrix.os }} @@ -309,14 +309,14 @@ jobs: packager: "apt" packages: "" - - os: macos-13 + - os: macos-latest cxx: "clang++" link: "dynamic" optimization: "size" assert: "ndebug" coverage: "nocov" boost: "--build-boost" - icu: "--with-icu" + icu: "" zmq: "--build-zmq" cc: "clang" flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" @@ -324,20 +324,20 @@ jobs: packager: "brew" packages: "icu4c" - - os: macos-13 + - os: macos-latest cxx: "clang++" link: "static" optimization: "size" assert: "ndebug" coverage: "nocov" boost: "--build-boost" - icu: "--build-icu --with-icu" + icu: "" zmq: "--build-zmq" cc: "clang" flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "" packager: "brew" - packages: "" + packages: "icu4c" runs-on: ${{ matrix.os }} diff --git a/install-cmake.sh b/install-cmake.sh index c199490..088bd84 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -69,7 +69,7 @@ ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz" # Boost archive. #------------------------------------------------------------------------------ -BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.78.0/boost_1_78_0.tar.bz2" +BOOST_URL="https://archives.boost.io/release/1.78.0/source/boost_1_78_0.tar.bz2" BOOST_ARCHIVE="boost_1_78_0.tar.bz2" diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh index 9f50bb4..63c5991 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -75,7 +75,7 @@ ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz" # Boost archive. #------------------------------------------------------------------------------ -BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.78.0/boost_1_78_0.tar.bz2" +BOOST_URL="https://archives.boost.io/release/1.78.0/source/boost_1_78_0.tar.bz2" BOOST_ARCHIVE="boost_1_78_0.tar.bz2" @@ -738,14 +738,9 @@ cmake_tests() # Build and run unit tests relative to the primary directory. # VERBOSE=1 ensures test runner output sent to console (gcc). - make -j"$JOBS" test "VERBOSE=1" + CTEST_OUTPUT_ON_FAILURE=ON make -j"$JOBS" test "VERBOSE=1" local RESULT=$? - # Test runners emit to the test.log file. - if [[ -e "test.log" ]]; then - cat "test.log" - fi - if [[ $RESULT -ne 0 ]]; then exit $RESULT fi diff --git a/install.sh b/install.sh index 50b270d..a75a945 100755 --- a/install.sh +++ b/install.sh @@ -69,7 +69,7 @@ ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz" # Boost archive. #------------------------------------------------------------------------------ -BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.78.0/boost_1_78_0.tar.bz2" +BOOST_URL="https://archives.boost.io/release/1.78.0/source/boost_1_78_0.tar.bz2" BOOST_ARCHIVE="boost_1_78_0.tar.bz2"