diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f34924e..5006d25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: packager: "apt" packages: "" - - os: macos-latest + - os: macos-13 cxx: "clang++" link: "dynamic" optimization: "size" @@ -87,12 +87,12 @@ jobs: icu: "--with-icu" zmq: "--build-zmq" cc: "clang" - flags: "-Os -fPIE" + flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "--enable-isystem" packager: "brew" packages: "icu4c" - - os: macos-latest + - os: macos-13 cxx: "clang++" link: "static" optimization: "size" @@ -102,7 +102,7 @@ jobs: icu: "--build-icu --with-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: "" @@ -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-protocol-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-protocol-test @@ -308,7 +309,7 @@ jobs: packager: "apt" packages: "" - - os: macos-latest + - os: macos-13 cxx: "clang++" link: "dynamic" optimization: "size" @@ -318,12 +319,12 @@ jobs: icu: "--with-icu" zmq: "--build-zmq" cc: "clang" - flags: "-Os -fPIE" + flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "" packager: "brew" packages: "icu4c" - - os: macos-latest + - os: macos-13 cxx: "clang++" link: "static" optimization: "size" @@ -333,7 +334,7 @@ jobs: icu: "--build-icu --with-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: "" @@ -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-protocol-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-protocol-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-protocol-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-protocol-test diff --git a/install-cmake.sh b/install-cmake.sh index 0941308..c199490 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -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 index 855f8d6..9f50bb4 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -585,7 +585,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..." @@ -631,7 +631,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 @@ -689,7 +689,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 @@ -724,7 +724,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[@]}" @@ -800,7 +800,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[@]}" @@ -886,7 +886,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 index 853b376..50b270d 100755 --- a/install.sh +++ b/install.sh @@ -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"