Skip to content

Commit c6c2cf9

Browse files
committed
fixup! ci: Test CMake edge cases
1 parent a545e32 commit c6c2cf9

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

.github/workflows/cmake.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,17 +259,17 @@ jobs:
259259
packages: 'clang-14 g++-multilib'
260260
c_compiler: 'clang-14 -m32'
261261
cxx_compiler: 'clang++-14 -m32'
262-
depends_options: 'NO_QT=1'
262+
depends_options: ''
263263
configure_options: '-DWERROR=ON'
264264
- name: 'MinGW-w64'
265265
triplet: 'x86_64-w64-mingw32'
266266
packages: 'g++-mingw-w64-x86-64-posix'
267-
depends_options: 'NO_QT=1'
267+
depends_options: ''
268268
exe_extension: '.exe'
269269
- name: 'MinGW-w64, debug'
270270
triplet: 'x86_64-w64-mingw32'
271271
packages: 'g++-mingw-w64-x86-64-posix'
272-
depends_options: 'NO_QT=1 DEBUG=1'
272+
depends_options: 'DEBUG=1'
273273
configure_options: '-DCMAKE_BUILD_TYPE=Debug'
274274
cache_suffix: '-debug'
275275
exe_extension: '.exe'
@@ -392,6 +392,9 @@ jobs:
392392
# to avoid linker errors when using vcpkg in the manifest mode.
393393
# See: https://github.com/bitcoin/bitcoin/pull/28934
394394
Add-Content -Path "$env:VCPKG_ROOT\triplets\x64-windows-static.cmake" -Value "set(VCPKG_PLATFORM_TOOLSET_VERSION $env:VCToolsVersion)"
395+
# Skip debug configuration to speed up build and minimize cache size.
396+
Add-Content -Path "$env:VCPKG_ROOT\triplets\x64-windows.cmake" -Value "set(VCPKG_BUILD_TYPE release)"
397+
Add-Content -Path "$env:VCPKG_ROOT\triplets\x64-windows-static.cmake" -Value "set(VCPKG_BUILD_TYPE release)"
395398
396399
- name: Restore vcpkg binary cache
397400
uses: actions/cache/restore@v3
@@ -453,7 +456,7 @@ jobs:
453456
env:
454457
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
455458
run: |
456-
brew install ccache cmake pkg-config boost libevent berkeley-db@4 libnatpmp miniupnpc zeromq tree
459+
brew install ccache cmake pkg-config boost libevent berkeley-db@4 qt@5 libnatpmp miniupnpc zeromq tree
457460
echo "CCACHE_DIR=${{ runner.temp }}/ccache" >> "$GITHUB_ENV"
458461
459462
- name: CMake version

0 commit comments

Comments
 (0)