Skip to content

Commit 0fb36c5

Browse files
committed
CI: vcpkg only build release
1 parent 4d401d1 commit 0fb36c5

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

.github/workflows/msvc.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
qt_version: 6.9.3
2323
qt_arch: win64_msvc2022_64
2424
qt_modules: qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine
25-
BUILD_TYPE: Release
2625
os: windows-2022
2726

2827
- CMAKE_GENERATOR_PLATFORM: arm64
@@ -32,7 +31,6 @@ jobs:
3231
qt_version: 6.9.3
3332
qt_arch: win64_msvc2022_arm64
3433
qt_modules: qt5compat qtimageformats qtmultimedia qtpositioning qtscxml qtserialport qtwebchannel qtwebsockets
35-
BUILD_TYPE: Release
3634
os: windows-11-arm
3735

3836
- CMAKE_GENERATOR_PLATFORM: Win32
@@ -44,7 +42,6 @@ jobs:
4442
qt_version: 5.15.2
4543
qt_arch: win32_msvc2019
4644
qt_modules: qtwebengine
47-
BUILD_TYPE: Release
4845
os: windows-2022
4946

5047
# See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
@@ -59,7 +56,7 @@ jobs:
5956
INSTALL_DIR: ${{github.workspace}}\.cache\install
6057
VCPKGGITCOMMITID: 7213cf8135c329c37c7e2778e40774489a0583a8
6158
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
62-
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
59+
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}-release
6360
VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
6461
VCPKG_OVERLAY_PORTS: "${{github.workspace}}/${{matrix.VCPKG_OVERLAY_PORTS}}"
6562
VCPKG_MANIFEST_FEATURES: "freerdp;vnc;terminal;filetransfer"

.github/workflows/vcpkg.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ jobs:
1818

1919
env:
2020
VCPKGGITCOMMITID: 6bc1613f18f850c60d906575296f982c6dfcc9e0
21+
CMAKE_GENERATOR: "Visual Studio 17 2022"
2122
CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
2223
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
23-
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
24+
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}-release
2425
VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
2526
VCPKG_INSTALLED_DIR: ${{github.workspace}}\.cache\install
2627
VCPKG_DEFAULT_BUILDTREES_ROOT: D:/bt
@@ -99,14 +100,14 @@ jobs:
99100
-DRABBIT_ENABLE_INSTALL_DEPENDENT=ON `
100101
-DRABBIT_ENABLE_INSTALL_QT=ON `
101102
-DRABBIT_ENABLE_INSTALL_TO_BUILD_PATH=ON `
102-
-DCMAKE_BUILD_TYPE=Release `
103103
-DCMAKE_INSTALL_PREFIX=${{env.BUILD_DIR}}/install `
104104
-DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}} `
105105
-DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake `
106106
-DVCPKG_MANIFEST_FEATURES="${{env.VCPKG_MANIFEST_FEATURES}}" `
107107
-DVCPKG_INSTALL_OPTIONS="--x-buildtrees-root=d:/b" `
108108
-DVCPKG_VERBOSE=ON `
109109
-DVCPKG_TARGET_TRIPLET="${{env.VCPKG_TARGET_TRIPLET}}" `
110+
-DVCPKG_DEFAULT_TRIPLET="${{env.VCPKG_DEFAULT_TRIPLET}}" `
110111
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON `
111112
-DVCPKG_APPLOCAL_DEPS=ON `
112113
-DVCPKG_TRACE_FIND_PACKAGE=ON `

0 commit comments

Comments
 (0)