From 107bdf8a071eba4d53ebf36f1f7c1811b2f5daf0 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 2 May 2024 00:54:32 +0100
Subject: [PATCH 1/2] fixup! ci: Test CMake edge cases

Force build step to fail if build fails. Otherwise, the build step might
falsely succeed because the last command exit code determines the return
status of the step.
---
 .github/workflows/cmake.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 7f7e7bf0404ee..3ca97267e1d24 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -489,9 +489,6 @@ jobs:
         run: |
           ccache --zero-stats
           cmake --build . -j $env:NUMBER_OF_PROCESSORS --config Release
-          dumpbin /imports src\Release\bitcoind.exe | Select-String -Pattern "\.(?i:dll)" | Sort-Object
-          ""
-          (Get-Item src\Release\bitcoind.exe).Length
 
       - name: Ccache stats
         run: |
@@ -505,6 +502,13 @@ jobs:
           path: ~/AppData/Local/ccache
           key: ${{ matrix.conf.triplet }}-ccache-${{ github.run_id }}
 
+      - name: Inspect build artifacts
+        working-directory: build
+        run: |
+          dumpbin /imports src\Release\bitcoind.exe | Select-String -Pattern "\.(?i:dll)" | Sort-Object
+          ""
+          (Get-Item src\Release\bitcoind.exe).Length
+
       - name: Test Release configuration
         working-directory: build
         run: |

From 729632c54fe0151fa1709556ae6cbd18ab996670 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 25 Apr 2024 20:21:40 +0100
Subject: [PATCH 2/2] fixup! ci: Test CMake edge cases

A workaround for a bug fixed in https://github.com/bitcoin/bitcoin/pull/29963
---
 .github/workflows/cmake.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 3ca97267e1d24..f86509c32e664 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -358,11 +358,8 @@ jobs:
 
       - name: Build depends
         working-directory: depends
-        env:
-          CC: ${{ matrix.host.c_compiler }}
-          CXX: ${{ matrix.host.cxx_compiler }}
         run: |
-          make -j$(nproc) HOST=${{ matrix.host.triplet }} ${{ matrix.host.depends_options }} LOG=1
+          make -j$(nproc) HOST=${{ matrix.host.triplet }} CC="${{ matrix.host.c_compiler }}" CXX="${{ matrix.host.cxx_compiler }}" ${{ matrix.host.depends_options }} LOG=1
 
       - name: Restore Ccache cache
         uses: actions/cache/restore@v4