Skip to content

Commit 07979be

Browse files
committed
CI: modify vcpkg.yml
1 parent 9189f0b commit 07979be

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/workflows/msvc.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,33 @@ jobs:
1818
- CMAKE_GENERATOR_PLATFORM: x64
1919
VCPKG_TARGET_TRIPLET: x64-windows
2020
VCPKG_PLATFORM_TOOLSET: v143
21+
VCPKG_NO_DEBUG: ON
22+
BUILD_TYPE: Release
2123
qt_version: 6.9.3
2224
qt_arch: win64_msvc2022_64
2325
qt_modules: qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine
24-
BUILD_TYPE: Release
2526
os: windows-2022
2627

2728
- CMAKE_GENERATOR_PLATFORM: arm64
2829
VCPKG_TARGET_TRIPLET: arm64-windows
2930
VCPKG_PLATFORM_TOOLSET: v143
31+
VCPKG_NO_DEBUG: ON
32+
BUILD_TYPE: Release
3033
qt_version: 6.9.3
3134
qt_arch: win64_msvc2022_arm64
3235
qt_modules: qt5compat qtimageformats qtmultimedia qtpositioning qtscxml qtserialport qtwebchannel qtwebsockets
33-
BUILD_TYPE: Release
3436
os: windows-11-arm
3537

3638
- CMAKE_GENERATOR_PLATFORM: Win32
3739
VCPKG_TARGET_TRIPLET: x86-windows
3840
VCPKG_PLATFORM_TOOLSET: v143
3941
VCPKG_OVERLAY_PORTS: "vcpkg/ports"
42+
VCPKG_NO_DEBUG: ON
43+
BUILD_TYPE: Release
4044
#VCPKG_MANIFEST_FEATURES: "ffmpeg"
4145
qt_version: 5.15.2
4246
qt_arch: win32_msvc2019
4347
qt_modules: qtwebengine
44-
BUILD_TYPE: Release
4548
os: windows-2022
4649

4750
# See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
@@ -61,6 +64,8 @@ jobs:
6164
VCPKG_OVERLAY_PORTS: "${{github.workspace}}/${{matrix.VCPKG_OVERLAY_PORTS}}"
6265
VCPKG_MANIFEST_FEATURES: "freerdp;vnc;terminal;filetransfer"
6366
VCPKG_INSTALLED_DIR: ${{github.workspace}}\.cache\install
67+
VCPKG_NO_DEBUG: ${{matrix.VCPKG_NO_DEBUG}}
68+
VCPKG_BUILD_TYPE: ${{matrix.BUILD_TYPE}}
6469
CMAKE_GENERATOR: "Visual Studio 17 2022"
6570
CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
6671
qt_modules: "${{matrix.qt_modules}}"

.github/workflows/vcpkg.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ 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}}
2324
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
@@ -104,6 +105,9 @@ jobs:
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}}" `
108+
-DVCPKG_INSTALL_OPTIONS="--clean-after-build --x-buildtrees-root=d:/b" `
109+
-DVCPKG_BUILD_TYPE=Release `
110+
-DVCPKG_NO_DEBUG=ON `
107111
-DVCPKG_VERBOSE=ON `
108112
-DVCPKG_TARGET_TRIPLET="${{env.VCPKG_TARGET_TRIPLET}}" `
109113
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON `

0 commit comments

Comments
 (0)