diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7051fce6..15e66b3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,7 @@ jobs: packager: "apt" packages: "lcov" - - os: macos-latest + - os: macos-13 cxx: "clang++" link: "dynamic" optimization: "size" @@ -82,12 +82,12 @@ jobs: boost: "--build-boost" icu: "--build-icu --with-icu" cc: "clang" - flags: "-Os -fPIE" + flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "--enable-isystem" packager: "brew" packages: "" - - os: macos-latest + - os: macos-13 cxx: "clang++" link: "static" optimization: "size" @@ -96,7 +96,7 @@ jobs: boost: "--build-boost" icu: "--build-icu --with-icu" cc: "clang" - flags: "-Os -fvisibility=hidden -fPIE" + flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "--enable-isystem" packager: "brew" packages: "" @@ -220,11 +220,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-node-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-node-test @@ -297,7 +298,7 @@ jobs: packager: "apt" packages: "" - - os: macos-latest + - os: macos-13 cxx: "clang++" link: "dynamic" optimization: "size" @@ -306,12 +307,12 @@ jobs: boost: "--build-boost" icu: "--build-icu --with-icu" cc: "clang" - flags: "-Os -fPIE" + flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "" packager: "brew" packages: "" - - os: macos-latest + - os: macos-13 cxx: "clang++" link: "static" optimization: "size" @@ -320,7 +321,7 @@ jobs: boost: "--build-boost" icu: "--build-icu --with-icu" cc: "clang" - flags: "-Os -fvisibility=hidden -fPIE" + flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "" packager: "brew" packages: "" @@ -447,11 +448,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-node-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-node-test @@ -646,11 +648,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-node-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-node-test