Regenerate artifacts.

pmienk · May 25, 2024 · 97a3e3e · 97a3e3e
1 parent 7a713d0
commit 97a3e3e
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 50 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -84,13 +84,13 @@ jobs:
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
-            icu: "--build-icu --with-icu"
+            icu: ""
             zmq: "--build-zmq"
             cc: "clang"
-            flags: "-Os -fPIE"
+            flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
             options: "--enable-isystem"
             packager: "brew"
-            packages: ""
+            packages: "icu4c"
 
           - os: macos-latest
             cxx: "clang++"
@@ -99,13 +99,13 @@ jobs:
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
-            icu: "--build-icu --with-icu"
+            icu: ""
             zmq: "--build-zmq"
             cc: "clang"
-            flags: "-Os -fvisibility=hidden -fPIE"
+            flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
             options: "--enable-isystem"
             packager: "brew"
-            packages: ""
+            packages: "icu4c"
 
 
     runs-on: ${{ matrix.os }}
@@ -187,7 +187,7 @@ jobs:
 
       - name: Coveralls.io Upload
         if: ${{ matrix.coverage == 'cov' }}
-        uses: coverallsapp/github-action@v2.2.3
+        uses: coverallsapp/github-action@v2.3.0
         with:
           format: lcov
           files: "./coverage.info"
@@ -227,11 +227,12 @@ jobs:
 
 
       - name: Failure display otool output
-        if: ${{ failure() && (matrix.os == 'macos-latest') }}
+        if: ${{ failure() && startsWith(matrix.os, 'macos') }}
         run: |
           otool -L ${{ github.workspace }}/test/.libs/libbitcoin-client-test
+
       - name: Failure display DYLD_PRINT_LIBRARIES
-        if: ${{ failure() && (matrix.os == 'macos-latest') }}
+        if: ${{ failure() && startsWith(matrix.os, 'macos') }}
         run: |
           DYLD_PRINT_LIBRARIES=1 ${{ github.workspace }}/test/.libs/libbitcoin-client-test
 
@@ -315,13 +316,13 @@ jobs:
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
-            icu: "--build-icu --with-icu"
+            icu: ""
             zmq: "--build-zmq"
             cc: "clang"
-            flags: "-Os -fPIE"
+            flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
             options: ""
             packager: "brew"
-            packages: ""
+            packages: "icu4c"
 
           - os: macos-latest
             cxx: "clang++"
@@ -330,13 +331,13 @@ jobs:
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
-            icu: "--build-icu --with-icu"
+            icu: ""
             zmq: "--build-zmq"
             cc: "clang"
-            flags: "-Os -fvisibility=hidden -fPIE"
+            flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
             options: ""
             packager: "brew"
-            packages: ""
+            packages: "icu4c"
 
 
     runs-on: ${{ matrix.os }}
@@ -421,7 +422,7 @@ jobs:
 
       - name: Coveralls.io Upload
         if: ${{ matrix.coverage == 'cov' }}
-        uses: coverallsapp/github-action@v2.2.3
+        uses: coverallsapp/github-action@v2.3.0
         with:
           format: lcov
           files: "./coverage.info"
@@ -461,11 +462,12 @@ jobs:
 
 
       - name: Failure display otool output
-        if: ${{ failure() && (matrix.os == 'macos-latest') }}
+        if: ${{ failure() && startsWith(matrix.os, 'macos') }}
         run: |
           otool -L ${{ github.workspace }}/test/.libs/libbitcoin-client-test
+
       - name: Failure display DYLD_PRINT_LIBRARIES
-        if: ${{ failure() && (matrix.os == 'macos-latest') }}
+        if: ${{ failure() && startsWith(matrix.os, 'macos') }}
         run: |
           DYLD_PRINT_LIBRARIES=1 ${{ github.workspace }}/test/.libs/libbitcoin-client-test
 
@@ -624,7 +626,7 @@ jobs:
 
       - name: Coveralls.io Upload
         if: ${{ matrix.coverage == 'cov' }}
-        uses: coverallsapp/github-action@v2.2.3
+        uses: coverallsapp/github-action@v2.3.0
         with:
           format: lcov
           files: "./coverage.info"
@@ -664,11 +666,12 @@ jobs:
 
 
       - name: Failure display otool output
-        if: ${{ failure() && (matrix.os == 'macos-latest') }}
+        if: ${{ failure() && startsWith(matrix.os, 'macos') }}
         run: |
           otool -L ${{ github.workspace }}/test/.libs/libbitcoin-client-test
+
       - name: Failure display DYLD_PRINT_LIBRARIES
-        if: ${{ failure() && (matrix.os == 'macos-latest') }}
+        if: ${{ failure() && startsWith(matrix.os, 'macos') }}
         run: |
           DYLD_PRINT_LIBRARIES=1 ${{ github.workspace }}/test/.libs/libbitcoin-client-test
 

diff --git a/install-cmake.sh b/install-cmake.sh
@@ -64,8 +64,8 @@ ICU_ARCHIVE="icu4c-55_2-src.tgz"
 
 # ZMQ archive.
 #------------------------------------------------------------------------------
-ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.3.4/zeromq-4.3.4.tar.gz"
-ZMQ_ARCHIVE="zeromq-4.3.4.tar.gz"
+ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz"
+ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz"
 
 # Boost archive.
 #------------------------------------------------------------------------------
@@ -539,7 +539,7 @@ unpack_from_tarball()
     local COMPRESSION=$3
     local BUILD=$4
 
-    display_heading_message "Prepairing to aquire $ARCHIVE"
+    display_heading_message "Preparing to acquire $ARCHIVE"
 
     if [[ ! ($BUILD) ]]; then
         display_message "Skipping unpack of $ARCHIVE..."
@@ -585,7 +585,7 @@ build_from_tarball()
         return
     fi
 
-    display_heading_message "Prepairing to build $ARCHIVE"
+    display_heading_message "Preparing to build $ARCHIVE"
 
     # Because ICU tools don't know how to locate internal dependencies.
     if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
@@ -643,7 +643,7 @@ create_from_github()
 
     FORK="$ACCOUNT/$REPO"
 
-    display_heading_message "Prepairing to aquire $FORK/$BRANCH"
+    display_heading_message "Preparing to acquire $FORK/$BRANCH"
 
     if [[ -d "$REPO" ]]; then
         if [[ true ]]; then
@@ -678,7 +678,7 @@ build_from_github()
     # Join generated and command line options.
     local CONFIGURATION=("${OPTIONS[@]}" "$@")
 
-    display_heading_message "Prepairing to build $REPO"
+    display_heading_message "Preparing to build $REPO"
 
     # Build the local repository clone.
     make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -746,7 +746,7 @@ build_from_github_cmake()
     # Join generated and command line options.
     local CONFIGURATION=("${OPTIONS[@]}" "$@")
 
-    display_heading_message "Prepairing to build $REPO"
+    display_heading_message "Preparing to build $REPO"
 
     # Build the local repository clone.
     cmake_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -832,7 +832,7 @@ build_from_tarball_boost()
         return
     fi
 
-    display_heading_message "Prepairing to build $ARCHIVE"
+    display_heading_message "Preparing to build $ARCHIVE"
 
     local TARGET="build-$ARCHIVE"
 

diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh
@@ -70,8 +70,8 @@ ICU_ARCHIVE="icu4c-55_2-src.tgz"
 
 # ZMQ archive.
 #------------------------------------------------------------------------------
-ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.3.4/zeromq-4.3.4.tar.gz"
-ZMQ_ARCHIVE="zeromq-4.3.4.tar.gz"
+ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz"
+ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz"
 
 # Boost archive.
 #------------------------------------------------------------------------------
@@ -587,7 +587,7 @@ unpack_from_tarball()
     local COMPRESSION=$3
     local BUILD=$4
 
-    display_heading_message "Prepairing to aquire $ARCHIVE"
+    display_heading_message "Preparing to acquire $ARCHIVE"
 
     if [[ ! ($BUILD) ]]; then
         display_message "Skipping unpack of $ARCHIVE..."
@@ -633,7 +633,7 @@ build_from_tarball()
         return
     fi
 
-    display_heading_message "Prepairing to build $ARCHIVE"
+    display_heading_message "Preparing to build $ARCHIVE"
 
     # Because ICU tools don't know how to locate internal dependencies.
     if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
@@ -691,7 +691,7 @@ create_from_github()
 
     FORK="$ACCOUNT/$REPO"
 
-    display_heading_message "Prepairing to aquire $FORK/$BRANCH"
+    display_heading_message "Preparing to acquire $FORK/$BRANCH"
 
     if [[ -d "$REPO" ]]; then
         if [[ true ]]; then
@@ -726,7 +726,7 @@ build_from_github()
     # Join generated and command line options.
     local CONFIGURATION=("${OPTIONS[@]}" "$@")
 
-    display_heading_message "Prepairing to build $REPO"
+    display_heading_message "Preparing to build $REPO"
 
     # Build the local repository clone.
     make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -740,14 +740,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
@@ -802,7 +797,7 @@ build_from_github_cmake()
     # Join generated and command line options.
     local CONFIGURATION=("${OPTIONS[@]}" "$@")
 
-    display_heading_message "Prepairing to build $REPO"
+    display_heading_message "Preparing to build $REPO"
 
     # Build the local repository clone.
     cmake_project_directory "$REPO" "$PRESET" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -888,7 +883,7 @@ build_from_tarball_boost()
         return
     fi
 
-    display_heading_message "Prepairing to build $ARCHIVE"
+    display_heading_message "Preparing to build $ARCHIVE"
 
     local TARGET="build-$ARCHIVE"
 

diff --git a/install.sh b/install.sh
@@ -64,8 +64,8 @@ ICU_ARCHIVE="icu4c-55_2-src.tgz"
 
 # ZMQ archive.
 #------------------------------------------------------------------------------
-ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.3.4/zeromq-4.3.4.tar.gz"
-ZMQ_ARCHIVE="zeromq-4.3.4.tar.gz"
+ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz"
+ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz"
 
 # Boost archive.
 #------------------------------------------------------------------------------
@@ -482,7 +482,7 @@ unpack_from_tarball()
     local COMPRESSION=$3
     local BUILD=$4
 
-    display_heading_message "Prepairing to aquire $ARCHIVE"
+    display_heading_message "Preparing to acquire $ARCHIVE"
 
     if [[ ! ($BUILD) ]]; then
         display_message "Skipping unpack of $ARCHIVE..."
@@ -528,7 +528,7 @@ build_from_tarball()
         return
     fi
 
-    display_heading_message "Prepairing to build $ARCHIVE"
+    display_heading_message "Preparing to build $ARCHIVE"
 
     # Because ICU tools don't know how to locate internal dependencies.
     if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
@@ -586,7 +586,7 @@ create_from_github()
 
     FORK="$ACCOUNT/$REPO"
 
-    display_heading_message "Prepairing to aquire $FORK/$BRANCH"
+    display_heading_message "Preparing to acquire $FORK/$BRANCH"
 
     if [[ -d "$REPO" ]]; then
         if [[ true ]]; then
@@ -621,7 +621,7 @@ build_from_github()
     # Join generated and command line options.
     local CONFIGURATION=("${OPTIONS[@]}" "$@")
 
-    display_heading_message "Prepairing to build $REPO"
+    display_heading_message "Preparing to build $REPO"
 
     # Build the local repository clone.
     make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -707,7 +707,7 @@ build_from_tarball_boost()
         return
     fi
 
-    display_heading_message "Prepairing to build $ARCHIVE"
+    display_heading_message "Preparing to build $ARCHIVE"
 
     local TARGET="build-$ARCHIVE"