From e0355c6ff7f8a3daf215640beba29f533dad9138 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Mon, 27 Jan 2025 22:20:41 -0800 Subject: [PATCH] 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' }}