Merge pull request #548 from pmienk/master

Regenerate artifacts.
libbitcoin · Feb 10, 2024 · 62889cd · 62889cd
2 parents e2a0051 + 0fd1d4a
commit 62889cd
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 113 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,30 +18,30 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "dynamic"
-            optimization: "size"
+            optimization: "debug"
             assert: "debug"
             coverage: "nocov"
             boost: "--build-boost"
             consensus: "--with-consensus"
             icu: ""
-            cc: "clang-14"
-            flags: "-Os -fPIE"
+            cc: "clang-15"
+            flags: "-Og -fPIE"
             options: "--enable-isystem"
             packager: "apt"
             packages: ""
 
           - os: ubuntu-22.04
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             consensus: "--with-consensus"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: "--enable-isystem"
             packager: "apt"
@@ -65,43 +65,43 @@ jobs:
           - os: ubuntu-22.04
             cxx: "g++-11"
             link: "static"
-            optimization: "debug"
+            optimization: "size"
             assert: "ndebug"
             coverage: "cov"
             boost: "--build-boost"
             consensus: "--with-consensus"
             icu: "--build-icu --with-icu"
             cc: "gcc-11"
-            flags: "-Og -g --coverage -fPIE"
+            flags: "-Os -g --coverage -fPIE"
             options: "--enable-isystem"
             packager: "apt"
             packages: "lcov"
 
           - os: macos-latest
-            cxx: "clang++-14"
+            cxx: "clang++"
             link: "dynamic"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             consensus: "--with-consensus"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang"
             flags: "-Os -fPIE"
             options: "--enable-isystem"
             packager: "brew"
             packages: ""
 
           - os: macos-latest
-            cxx: "clang++-14"
+            cxx: "clang++"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             consensus: "--without-consensus"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang"
             flags: "-Os -fvisibility=hidden -fPIE"
             options: "--enable-isystem"
             packager: "brew"
@@ -119,7 +119,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare toolchain [generic]
         run: |
@@ -140,7 +140,7 @@ jobs:
         shell: bash
         run: |
           WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-blockchain}"
-          echo "LIBBITCOIN_SRC_PATH=$WORKSPACE_SUBPATH" >> $GITHUB_ENV
+          echo "LIBBITCOIN_SRC_PATH=${WORKSPACE_SUBPATH}" >> $GITHUB_ENV
           if [[ ${{ matrix.assert }} == 'ndebug' ]]; then
             echo "ASSERT_NDEBUG=--enable-ndebug" >> $GITHUB_ENV
           else
@@ -152,9 +152,15 @@ jobs:
             echo "LINKAGE=--disable-shared" >> $GITHUB_ENV
           fi
           if [[ ${{ matrix.link }} == 'dynamic' ]]; then
-            echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
+            echo "LDFLAGS=-Wl,-rpath,${WORKSPACE_SUBPATH}prefix/lib" >> $GITHUB_ENV
           fi
 
+      - name: Display Compiler details
+        shell: bash
+        run: |
+          ${CC} -v
+          ${CXX} -v
+
       - name: Display CPU details
         if: ${{ (runner.os == 'Linux') }}
         shell: bash
@@ -164,8 +170,8 @@ jobs:
       - name: Execute install.sh
         run: >
           ./install.sh
-          --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
-          --prefix=$LIBBITCOIN_SRC_PATH/prefix
+          --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
+          --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix
           ${{ env.LINKAGE }}
           ${{ env.ASSERT_NDEBUG }}
           ${{ matrix.boost }}
@@ -242,30 +248,30 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "dynamic"
-            optimization: "size"
+            optimization: "debug"
             assert: "debug"
             coverage: "nocov"
             boost: "--build-boost"
             consensus: "--with-consensus"
             icu: ""
-            cc: "clang-14"
-            flags: "-Os -fPIE"
+            cc: "clang-15"
+            flags: "-Og -fPIE"
             options: ""
             packager: "apt"
             packages: ""
 
           - os: ubuntu-22.04
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             consensus: "--with-consensus"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: ""
             packager: "apt"
@@ -289,43 +295,43 @@ jobs:
           - os: ubuntu-22.04
             cxx: "g++-11"
             link: "static"
-            optimization: "debug"
+            optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             consensus: "--with-consensus"
             icu: "--build-icu --with-icu"
             cc: "gcc-11"
-            flags: "-Og -fPIE"
+            flags: "-Os -fPIE"
             options: ""
             packager: "apt"
             packages: ""
 
           - os: macos-latest
-            cxx: "clang++-14"
+            cxx: "clang++"
             link: "dynamic"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             consensus: "--with-consensus"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang"
             flags: "-Os -fPIE"
             options: ""
             packager: "brew"
             packages: ""
 
           - os: macos-latest
-            cxx: "clang++-14"
+            cxx: "clang++"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             consensus: "--without-consensus"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang"
             flags: "-Os -fvisibility=hidden -fPIE"
             options: ""
             packager: "brew"
@@ -343,7 +349,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare toolchain [generic]
         run: |
@@ -364,7 +370,7 @@ jobs:
         shell: bash
         run: |
           WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-blockchain}"
-          echo "LIBBITCOIN_SRC_PATH=$WORKSPACE_SUBPATH" >> $GITHUB_ENV
+          echo "LIBBITCOIN_SRC_PATH=${WORKSPACE_SUBPATH}" >> $GITHUB_ENV
           if [[ ${{ matrix.packager }} == 'brew' ]]; then
             echo "CMAKE_LIBRARY_PATH=/usr/local/lib" >> $GITHUB_ENV
           fi
@@ -379,9 +385,15 @@ jobs:
             echo "LINKAGE=--disable-shared" >> $GITHUB_ENV
           fi
           if [[ ${{ matrix.link }} == 'dynamic' ]]; then
-            echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
+            echo "LDFLAGS=-Wl,-rpath,${WORKSPACE_SUBPATH}prefix/lib" >> $GITHUB_ENV
           fi
 
+      - name: Display Compiler details
+        shell: bash
+        run: |
+          ${CC} -v
+          ${CXX} -v
+
       - name: Display CPU details
         if: ${{ (runner.os == 'Linux') }}
         shell: bash
@@ -391,8 +403,8 @@ jobs:
       - name: Execute install-cmake.sh
         run: >
           ./install-cmake.sh
-          --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
-          --prefix=$LIBBITCOIN_SRC_PATH/prefix
+          --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
+          --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix
           ${{ env.LINKAGE }}
           ${{ env.ASSERT_NDEBUG }}
           ${{ matrix.boost }}
@@ -480,31 +492,31 @@ jobs:
         include:
           - os: ubuntu-22.04
             preset: "nix-gnu-debug-shared-with_consensus"
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "dynamic"
-            optimization: "size"
+            optimization: "debug"
             assert: "debug"
             coverage: "nocov"
             boost: "--build-boost"
             consensus: "--with-consensus"
             icu: ""
-            cc: "clang-14"
-            flags: "-Os -fPIE"
+            cc: "clang-15"
+            flags: "-Og -fPIE"
             options: ""
             packager: "apt"
             packages: ""
 
           - os: ubuntu-22.04
             preset: "nix-gnu-release-static-size-with_consensus"
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             consensus: "--with-consensus"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: ""
             packager: "apt"
@@ -538,7 +550,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare toolchain [generic]
         run: |
@@ -559,7 +571,7 @@ jobs:
         shell: bash
         run: |
           WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-blockchain}"
-          echo "LIBBITCOIN_SRC_PATH=$WORKSPACE_SUBPATH" >> $GITHUB_ENV
+          echo "LIBBITCOIN_SRC_PATH=${WORKSPACE_SUBPATH}" >> $GITHUB_ENV
           if [[ ${{ matrix.packager }} == 'brew' ]]; then
             echo "CMAKE_LIBRARY_PATH=/usr/local/lib" >> $GITHUB_ENV
           fi
@@ -574,9 +586,15 @@ jobs:
             echo "LINKAGE=--disable-shared" >> $GITHUB_ENV
           fi
           if [[ ${{ matrix.link }} == 'dynamic' ]]; then
-            echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV
+            echo "LDFLAGS=-Wl,-rpath,${WORKSPACE_SUBPATH}prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV
           fi
 
+      - name: Display Compiler details
+        shell: bash
+        run: |
+          ${CC} -v
+          ${CXX} -v
+
       - name: Display CPU details
         if: ${{ (runner.os == 'Linux') }}
         shell: bash
@@ -586,8 +604,8 @@ jobs:
       - name: Execute install-cmakepresets.sh
         run: >
           ./install-cmakepresets.sh
-          --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
-          --prefix=$LIBBITCOIN_SRC_PATH/prefix/${{ matrix.preset }}
+          --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
+          --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix/${{ matrix.preset }}
           --preset=${{ matrix.preset }}
           ${{ env.LINKAGE }}
           ${{ env.ASSERT_NDEBUG }}
@@ -694,7 +712,7 @@ jobs:
           msbuild-architecture: x64
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize SDK
         shell: powershell