Skip to content

Commit fc8bc6f

Browse files
committed
CI: vcpkg only build release
1 parent e23cef5 commit fc8bc6f

3 files changed

Lines changed: 9 additions & 27 deletions

File tree

.github/workflows/msvc.yml

Lines changed: 0 additions & 3 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)

.github/workflows/vcpkg.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,18 @@ on:
88

99
jobs:
1010
vcpkg:
11+
if: false
1112
strategy:
1213
matrix:
1314
include:
1415
- CMAKE_GENERATOR_PLATFORM: x64
15-
VCPKG_TARGET_TRIPLET: x64-windows
16+
VCPKG_TARGET_TRIPLET: x64-windows-release
1617
VCPKG_PLATFORM_TOOLSET: v143
1718
os: windows-2022
1819

1920
env:
2021
VCPKGGITCOMMITID: 6bc1613f18f850c60d906575296f982c6dfcc9e0
22+
CMAKE_GENERATOR: "Visual Studio 17 2022"
2123
CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
2224
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
2325
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
@@ -99,14 +101,14 @@ jobs:
99101
-DRABBIT_ENABLE_INSTALL_DEPENDENT=ON `
100102
-DRABBIT_ENABLE_INSTALL_QT=ON `
101103
-DRABBIT_ENABLE_INSTALL_TO_BUILD_PATH=ON `
102-
-DCMAKE_BUILD_TYPE=Release `
103104
-DCMAKE_INSTALL_PREFIX=${{env.BUILD_DIR}}/install `
104105
-DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}} `
105106
-DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake `
106107
-DVCPKG_MANIFEST_FEATURES="${{env.VCPKG_MANIFEST_FEATURES}}" `
107108
-DVCPKG_INSTALL_OPTIONS="--x-buildtrees-root=d:/b" `
108109
-DVCPKG_VERBOSE=ON `
109110
-DVCPKG_TARGET_TRIPLET="${{env.VCPKG_TARGET_TRIPLET}}" `
111+
-DVCPKG_DEFAULT_TRIPLET="${{env.VCPKG_DEFAULT_TRIPLET}}" `
110112
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON `
111113
-DVCPKG_APPLOCAL_DEPS=ON `
112114
-DVCPKG_TRACE_FIND_PACKAGE=ON `

vcpkg.json

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,13 @@
2121
"dependencies": [
2222
"qttools",
2323
"qtbase",
24-
{
25-
"name": "qt5compat",
26-
"default-features": false,
27-
"features": ["big-codecs","codecs","textcodec"]
28-
},
29-
{
30-
"name": "qtmultimedia",
31-
"default-features": false,
32-
"features": ["ffmpeg", "widgets"]
33-
},
34-
{
35-
"name": "qtscxml",
36-
"default-features": false
37-
},
24+
"qt5compat",
25+
"qtmultimedia",
26+
"qtscxml",
3827
"qtserialport",
39-
{
40-
"name": "qtwebchannel",
41-
"default-features": false
42-
},
28+
"qtwebchannel",
4329
"qtwebengine",
44-
{
45-
"name": "qtwebsockets",
46-
"default-features": false
47-
},
30+
"qtwebsockets",
4831
"qttranslations",
4932
"qtsvg",
5033
"qtimageformats"

0 commit comments

Comments
 (0)