From 52e5896112b5b2371ad1d520ef0095adabe2db7f Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Mon, 27 Jan 2025 20:17:41 -0800 Subject: [PATCH 1/2] Regenerate artifacts. --- .github/workflows/ci.yml | 66 ++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce9040c..fad5c8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,8 +17,8 @@ jobs: matrix: include: - - os: ubuntu-22.04 - cxx: "clang++-15" + - os: ubuntu-24.04 + cxx: "clang++-16" link: "dynamic" optimization: "debug" assert: "debug" @@ -28,14 +28,14 @@ jobs: icu: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" - cc: "clang-15" + cc: "clang-16" flags: "-Og -fPIE" options: "--enable-isystem" packager: "apt" packages: "" - - os: ubuntu-22.04 - cxx: "clang++-15" + - os: ubuntu-24.04 + cxx: "clang++-16" link: "static" optimization: "size" assert: "ndebug" @@ -45,14 +45,14 @@ jobs: icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" zmq: "--build-zmq" - cc: "clang-15" + cc: "clang-16" flags: "-Os -fPIE" options: "--enable-isystem" packager: "apt" packages: "" - - os: ubuntu-22.04 - cxx: "g++-11" + - os: ubuntu-24.04 + cxx: "g++-12" link: "dynamic" optimization: "size" assert: "ndebug" @@ -62,14 +62,14 @@ jobs: icu: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" - cc: "gcc-11" + cc: "gcc-12" flags: "-Os -fPIE" options: "--enable-isystem" packager: "apt" packages: "" - - os: ubuntu-22.04 - cxx: "g++-11" + - os: ubuntu-24.04 + cxx: "g++-12" link: "static" optimization: "size" assert: "ndebug" @@ -79,7 +79,7 @@ jobs: icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" zmq: "--build-zmq" - cc: "gcc-11" + cc: "gcc-12" flags: "-Os -fPIE" options: "--enable-isystem" packager: "apt" @@ -286,8 +286,8 @@ jobs: matrix: include: - - os: ubuntu-22.04 - cxx: "clang++-15" + - os: ubuntu-24.04 + cxx: "clang++-16" link: "dynamic" optimization: "debug" assert: "debug" @@ -297,14 +297,14 @@ jobs: icu: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" - cc: "clang-15" + cc: "clang-16" flags: "-Og -fPIE" options: "" packager: "apt" packages: "" - - os: ubuntu-22.04 - cxx: "clang++-15" + - os: ubuntu-24.04 + cxx: "clang++-16" link: "static" optimization: "size" assert: "ndebug" @@ -314,14 +314,14 @@ jobs: icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" zmq: "--build-zmq" - cc: "clang-15" + cc: "clang-16" flags: "-Os -fPIE" options: "" packager: "apt" packages: "" - - os: ubuntu-22.04 - cxx: "g++-11" + - os: ubuntu-24.04 + cxx: "g++-12" link: "dynamic" optimization: "size" assert: "ndebug" @@ -331,14 +331,14 @@ jobs: icu: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" - cc: "gcc-11" + cc: "gcc-12" flags: "-Os -fPIE" options: "" packager: "apt" packages: "" - - os: ubuntu-22.04 - cxx: "g++-11" + - os: ubuntu-24.04 + cxx: "g++-12" link: "static" optimization: "size" assert: "ndebug" @@ -348,7 +348,7 @@ jobs: icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" zmq: "--build-zmq" - cc: "gcc-11" + cc: "gcc-12" flags: "-Os -fPIE" options: "" packager: "apt" @@ -568,9 +568,9 @@ jobs: matrix: include: - - os: ubuntu-22.04 + - os: ubuntu-24.04 preset: "nix-gnu-debug-shared" - cxx: "clang++-15" + cxx: "clang++-16" link: "dynamic" optimization: "debug" assert: "debug" @@ -580,15 +580,15 @@ jobs: icu: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" - cc: "clang-15" + cc: "clang-16" flags: "-Og -fPIE" options: "" packager: "apt" packages: "" - - os: ubuntu-22.04 + - os: ubuntu-24.04 preset: "nix-gnu-release-static" - cxx: "clang++-15" + cxx: "clang++-16" link: "static" optimization: "size" assert: "ndebug" @@ -598,15 +598,15 @@ jobs: icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" zmq: "--build-zmq" - cc: "clang-15" + cc: "clang-16" flags: "-Os -fPIE" options: "" packager: "apt" packages: "" - - os: ubuntu-22.04 + - os: ubuntu-24.04 preset: "nix-gnu-release-shared" - cxx: "g++-11" + cxx: "g++-12" link: "dynamic" optimization: "size" assert: "ndebug" @@ -616,7 +616,7 @@ jobs: icu: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" - cc: "gcc-11" + cc: "gcc-12" flags: "-Os -fPIE" options: "" packager: "apt" From 1afbe89d8f8323dee861e336d0e98fa31a4e54dd Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Mon, 27 Jan 2025 22:26:01 -0800 Subject: [PATCH 2/2] Regenerate artifacts. --- .github/workflows/ci.yml | 50 +++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fad5c8f..c292018 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang-16" @@ -43,6 +44,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "--build-icu --with-icu" + llvm: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang-16" @@ -60,6 +62,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "gcc-12" @@ -77,6 +80,7 @@ jobs: detectcpuflags: "detect" boost: "--build-boost" icu: "--build-icu --with-icu" + llvm: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "gcc-12" @@ -94,13 +98,14 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "llvm@16" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang" flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "--enable-isystem" packager: "brew" - packages: "icu4c" + packages: "llvm@16 icu4c" - os: macos-latest cxx: "clang++" @@ -111,13 +116,14 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "llvm@16" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang" flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "--enable-isystem" packager: "brew" - packages: "icu4c" + packages: "llvm@16 icu4c" runs-on: ${{ matrix.os }} @@ -147,6 +153,9 @@ jobs: if: ${{ matrix.packager == 'brew' }} run: | brew install autoconf automake libtool ${{ matrix.packages }} + if [[ -n ${{ matrix.llvm }} ]]; then + echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV + fi - name: Determine CPU flags shell: bash @@ -218,9 +227,9 @@ jobs: - name: Coveralls Calculation if: ${{ matrix.coverage == 'cov' }} run: | - lcov --directory . --capture --output-file coverage.info - lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file coverage.info - lcov --list coverage.info + lcov --directory . --capture --ignore-errors version --output-file coverage.info + lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file --ignore-errors version coverage.info + lcov --list --ignore-errors version coverage.info - name: Coveralls.io Upload if: ${{ matrix.coverage == 'cov' }} @@ -295,6 +304,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang-16" @@ -312,6 +322,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "--build-icu --with-icu" + llvm: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang-16" @@ -329,6 +340,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "gcc-12" @@ -346,6 +358,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "--build-icu --with-icu" + llvm: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "gcc-12" @@ -363,13 +376,14 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "llvm@16" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang" flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "" packager: "brew" - packages: "icu4c" + packages: "llvm@16 icu4c" - os: macos-latest cxx: "clang++" @@ -380,13 +394,14 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "llvm@16" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang" flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "" packager: "brew" - packages: "icu4c" + packages: "llvm@16 icu4c" runs-on: ${{ matrix.os }} @@ -416,6 +431,9 @@ jobs: if: ${{ matrix.packager == 'brew' }} run: | brew install autoconf automake libtool ${{ matrix.packages }} + if [[ -n ${{ matrix.llvm }} ]]; then + echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV + fi - name: Determine CPU flags shell: bash @@ -490,9 +508,9 @@ jobs: - name: Coveralls Calculation if: ${{ matrix.coverage == 'cov' }} run: | - lcov --directory . --capture --output-file coverage.info - lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file coverage.info - lcov --list coverage.info + lcov --directory . --capture --ignore-errors version --output-file coverage.info + lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file --ignore-errors version coverage.info + lcov --list --ignore-errors version coverage.info - name: Coveralls.io Upload if: ${{ matrix.coverage == 'cov' }} @@ -578,6 +596,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang-16" @@ -596,6 +615,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "--build-icu --with-icu" + llvm: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "clang-16" @@ -614,6 +634,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "" secp256k1: "--build-secp256k1" zmq: "--build-zmq" cc: "gcc-12" @@ -650,6 +671,9 @@ jobs: if: ${{ matrix.packager == 'brew' }} run: | brew install autoconf automake libtool ${{ matrix.packages }} + if [[ -n ${{ matrix.llvm }} ]]; then + echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV + fi - name: Determine CPU flags shell: bash @@ -725,9 +749,9 @@ jobs: - name: Coveralls Calculation if: ${{ matrix.coverage == 'cov' }} run: | - lcov --directory . --capture --output-file coverage.info - lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file coverage.info - lcov --list coverage.info + lcov --directory . --capture --ignore-errors version --output-file coverage.info + lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file --ignore-errors version coverage.info + lcov --list --ignore-errors version coverage.info - name: Coveralls.io Upload if: ${{ matrix.coverage == 'cov' }}