From 1d2525fdfa6897186db829456b90c172731f7ed0 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Mon, 27 Jan 2025 20:01:26 -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 cc22478ac7..442ef528ce 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" @@ -27,14 +27,14 @@ jobs: boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" - cc: "clang-15" + cc: "clang-16" flags: "-Og -fPIE" options: "--enable-isystem --enable-avx2 --enable-sse41" packager: "apt" packages: "" - - os: ubuntu-22.04 - cxx: "clang++-15" + - os: ubuntu-24.04 + cxx: "clang++-16" link: "static" optimization: "size" assert: "ndebug" @@ -43,14 +43,14 @@ jobs: boost: "--build-boost" icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" - cc: "clang-15" + cc: "clang-16" flags: "-Os -fPIE" options: "--enable-isystem --enable-avx2" packager: "apt" packages: "" - - os: ubuntu-22.04 - cxx: "g++-11" + - os: ubuntu-24.04 + cxx: "g++-12" link: "dynamic" optimization: "size" assert: "ndebug" @@ -59,14 +59,14 @@ jobs: boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" - cc: "gcc-11" + cc: "gcc-12" flags: "-Os -fPIE" options: "--enable-isystem --enable-sse41" packager: "apt" packages: "" - - os: ubuntu-22.04 - cxx: "g++-11" + - os: ubuntu-24.04 + cxx: "g++-12" link: "static" optimization: "size" assert: "ndebug" @@ -75,7 +75,7 @@ jobs: boost: "--build-boost" icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" - cc: "gcc-11" + cc: "gcc-12" flags: "-Os -g --coverage -fPIE" options: "--enable-isystem" packager: "apt" @@ -279,8 +279,8 @@ jobs: matrix: include: - - os: ubuntu-22.04 - cxx: "clang++-15" + - os: ubuntu-24.04 + cxx: "clang++-16" link: "dynamic" optimization: "debug" assert: "debug" @@ -289,14 +289,14 @@ jobs: boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" - cc: "clang-15" + cc: "clang-16" flags: "-Og -fPIE" options: "-Denable-avx2=on -Denable-sse41=on" packager: "apt" packages: "" - - os: ubuntu-22.04 - cxx: "clang++-15" + - os: ubuntu-24.04 + cxx: "clang++-16" link: "static" optimization: "size" assert: "ndebug" @@ -305,14 +305,14 @@ jobs: boost: "--build-boost" icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" - cc: "clang-15" + cc: "clang-16" flags: "-Os -fPIE" options: "-Denable-avx2=on" packager: "apt" packages: "" - - os: ubuntu-22.04 - cxx: "g++-11" + - os: ubuntu-24.04 + cxx: "g++-12" link: "dynamic" optimization: "size" assert: "ndebug" @@ -321,14 +321,14 @@ jobs: boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" - cc: "gcc-11" + cc: "gcc-12" flags: "-Os -fPIE" options: "-Denable-sse41=on" packager: "apt" packages: "" - - os: ubuntu-22.04 - cxx: "g++-11" + - os: ubuntu-24.04 + cxx: "g++-12" link: "static" optimization: "size" assert: "ndebug" @@ -337,7 +337,7 @@ jobs: boost: "--build-boost" icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" - cc: "gcc-11" + cc: "gcc-12" flags: "-Os -fPIE" options: "" packager: "apt" @@ -554,9 +554,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" @@ -565,15 +565,15 @@ jobs: boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" - cc: "clang-15" + cc: "clang-16" flags: "-Og -fPIE" options: "-Denable-avx2=on -Denable-sse41=on" 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" @@ -582,15 +582,15 @@ jobs: boost: "--build-boost" icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" - cc: "clang-15" + cc: "clang-16" flags: "-Os -fPIE" options: "-Denable-avx2=on" 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" @@ -599,7 +599,7 @@ jobs: boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" - cc: "gcc-11" + cc: "gcc-12" flags: "-Os -fPIE" options: "-Denable-sse41=on" packager: "apt" From e0355c6ff7f8a3daf215640beba29f533dad9138 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Mon, 27 Jan 2025 22:20:41 -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 442ef528ce..6f2d81626e 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" cc: "clang-16" flags: "-Og -fPIE" @@ -42,6 +43,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "--build-icu --with-icu" + llvm: "" secp256k1: "--build-secp256k1" cc: "clang-16" flags: "-Os -fPIE" @@ -58,6 +60,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "" secp256k1: "--build-secp256k1" cc: "gcc-12" flags: "-Os -fPIE" @@ -74,6 +77,7 @@ jobs: detectcpuflags: "detect" boost: "--build-boost" icu: "--build-icu --with-icu" + llvm: "" secp256k1: "--build-secp256k1" cc: "gcc-12" flags: "-Os -g --coverage -fPIE" @@ -90,12 +94,13 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "llvm@16" secp256k1: "--build-secp256k1" 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++" @@ -106,12 +111,13 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "llvm@16" secp256k1: "--build-secp256k1" 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 }} @@ -141,6 +147,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 @@ -211,9 +220,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/*" "${{ github.workspace }}/src/wallet/addresses/qrencode/*" --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/*" "${{ github.workspace }}/src/wallet/addresses/qrencode/*" --output-file --ignore-errors version coverage.info + lcov --list --ignore-errors version coverage.info - name: Coveralls.io Upload if: ${{ matrix.coverage == 'cov' }} @@ -288,6 +297,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "" secp256k1: "--build-secp256k1" cc: "clang-16" flags: "-Og -fPIE" @@ -304,6 +314,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "--build-icu --with-icu" + llvm: "" secp256k1: "--build-secp256k1" cc: "clang-16" flags: "-Os -fPIE" @@ -320,6 +331,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "" secp256k1: "--build-secp256k1" cc: "gcc-12" flags: "-Os -fPIE" @@ -336,6 +348,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "--build-icu --with-icu" + llvm: "" secp256k1: "--build-secp256k1" cc: "gcc-12" flags: "-Os -fPIE" @@ -352,12 +365,13 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "llvm@16" secp256k1: "--build-secp256k1" cc: "clang" flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "" packager: "brew" - packages: "icu4c" + packages: "llvm@16 icu4c" - os: macos-latest cxx: "clang++" @@ -368,12 +382,13 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "llvm@16" secp256k1: "--build-secp256k1" 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 }} @@ -403,6 +418,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 @@ -476,9 +494,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/*" "${{ github.workspace }}/src/wallet/addresses/qrencode/*" --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/*" "${{ github.workspace }}/src/wallet/addresses/qrencode/*" --output-file --ignore-errors version coverage.info + lcov --list --ignore-errors version coverage.info - name: Coveralls.io Upload if: ${{ matrix.coverage == 'cov' }} @@ -564,6 +582,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "" secp256k1: "--build-secp256k1" cc: "clang-16" flags: "-Og -fPIE" @@ -581,6 +600,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "--build-icu --with-icu" + llvm: "" secp256k1: "--build-secp256k1" cc: "clang-16" flags: "-Os -fPIE" @@ -598,6 +618,7 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" + llvm: "" secp256k1: "--build-secp256k1" cc: "gcc-12" flags: "-Os -fPIE" @@ -633,6 +654,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 @@ -707,9 +731,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/*" "${{ github.workspace }}/src/wallet/addresses/qrencode/*" --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/*" "${{ github.workspace }}/src/wallet/addresses/qrencode/*" --output-file --ignore-errors version coverage.info + lcov --list --ignore-errors version coverage.info - name: Coveralls.io Upload if: ${{ matrix.coverage == 'cov' }}