Merge pull request #510 from evoskuil/master

Regenerate artifacts.
libbitcoin · Jul 22, 2024 · 3a17a7c · 3a17a7c
2 parents cdea3af + 33c5169
commit 3a17a7c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"