From 33c5169c846f6da968c69abe880798df110bebcf Mon Sep 17 00:00:00 2001 From: evoskuil Date: Mon, 22 Jul 2024 13:37:32 -0400 Subject: [PATCH] Regenerate artifacts. --- .github/workflows/ci.yml | 24 ++++++++++++------------ install-cmake.sh | 2 +- install-cmakepresets.sh | 9 ++------- install.sh | 2 +- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4a53656..d3796620 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,33 +73,33 @@ jobs: packager: "apt" packages: "lcov" - - os: macos-13 + - os: macos-latest cxx: "clang++" link: "dynamic" optimization: "size" assert: "ndebug" coverage: "nocov" boost: "--build-boost" - icu: "--build-icu --with-icu" + icu: "" cc: "clang" flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "--enable-isystem" packager: "brew" - packages: "" + 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: "" cc: "clang" flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "--enable-isystem" packager: "brew" - packages: "" + packages: "icu4c" runs-on: ${{ matrix.os }} @@ -298,33 +298,33 @@ jobs: packager: "apt" packages: "" - - os: macos-13 + - os: macos-latest cxx: "clang++" link: "dynamic" optimization: "size" assert: "ndebug" coverage: "nocov" boost: "--build-boost" - icu: "--build-icu --with-icu" + icu: "" cc: "clang" flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "" packager: "brew" - packages: "" + 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: "" 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 d3f6c8b0..e63560c1 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -63,7 +63,7 @@ ICU_ARCHIVE="icu4c-55_2-src.tgz" # 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 21cf4b5a..916cc3e0 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -69,7 +69,7 @@ ICU_ARCHIVE="icu4c-55_2-src.tgz" # 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" @@ -729,14 +729,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 7769622e..44f1fff8 100755 --- a/install.sh +++ b/install.sh @@ -63,7 +63,7 @@ ICU_ARCHIVE="icu4c-55_2-src.tgz" # 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"