Skip to content

Commit

Permalink
Merge #183: cmake: Fix and improve CI
Browse files Browse the repository at this point in the history
729632c fixup! ci: Test CMake edge cases (Hennadii Stepanov)
107bdf8 fixup! ci: Test CMake edge cases (Hennadii Stepanov)

Pull request description:

  1. The first commit forces the build step in the native Windows jobs 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.

  I've noticed such wrong behaviour while working on #182.

  2. The second commit pulled from #125.

ACKs for top commit:
  m3dwards:
    utACK 729632c

Tree-SHA512: 3530f8c2d60896665adff52caaf88460e18bf1087f9350337a4f191558023ee3484b0639673f90c48d6c24074338b640d5cfde067bb90344dfebaa2d6173f1cc
  • Loading branch information
hebasto committed May 2, 2024
2 parents c6261b9 + 729632c commit 8c74f93
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -489,9 +486,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: |
Expand All @@ -505,6 +499,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: |
Expand Down

0 comments on commit 8c74f93

Please sign in to comment.