From 86785f4031c839f24d1b460036a925a1ef53f708 Mon Sep 17 00:00:00 2001 From: SineStriker Date: Mon, 17 Aug 2026 14:46:14 +0800 Subject: [PATCH 1/2] Fix .gitsubmodules and vcpkg overlay --- .gitmodules | 5 +++-- scripts/vcpkg | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index f161356a..fb15e35e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,6 +29,7 @@ [submodule "opendspx"] path = src/libs/3rdparty/opendspx url = ../../diffscope/opendspx.git -[submodule "src/libs/3rdparty/dspxmodel"] + +[submodule "dspxmodel"] path = src/libs/3rdparty/dspxmodel - url = git@github.com:diffscope/dspxmodel.git + url = ../../diffscope/dspxmodel.git diff --git a/scripts/vcpkg b/scripts/vcpkg index 49fcd2d3..bbaf7862 160000 --- a/scripts/vcpkg +++ b/scripts/vcpkg @@ -1 +1 @@ -Subproject commit 49fcd2d3fdb9723cf1d6d8641aeb443f3aedfc7f +Subproject commit bbaf78620b0fde7f521e379e1631c99630365a85 From e8015e804403b09213a39c1c55fa1bbf1942f528 Mon Sep 17 00:00:00 2001 From: SineStriker Date: Mon, 17 Aug 2026 15:24:53 +0800 Subject: [PATCH 2/2] Fix CI error --- .github/actions/initialize-vcpkg/action.yml | 3 +-- scripts/vcpkg | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/actions/initialize-vcpkg/action.yml b/.github/actions/initialize-vcpkg/action.yml index 06f24589..242b04d1 100644 --- a/.github/actions/initialize-vcpkg/action.yml +++ b/.github/actions/initialize-vcpkg/action.yml @@ -33,8 +33,7 @@ runs: env: QT_DIR: ${{ env.Qt_ROOT_DIR }}/lib/cmake/Qt6 Qt6_DIR: ${{ env.Qt_ROOT_DIR }}/lib/cmake/Qt6 - VCPKG_CMAKE_RELEASE_BUILD_TYPE: "RelWithDebInfo" - VCPKG_KEEP_ENV_VARS: "QT_DIR;Qt6_DIR;VCPKG_CMAKE_RELEASE_BUILD_TYPE;VCPKG_BUILD_TYPE;MACOSX_DEPLOYMENT_TARGET" + VCPKG_KEEP_ENV_VARS: "QT_DIR;Qt6_DIR;VCPKG_BUILD_TYPE;MACOSX_DEPLOYMENT_TARGET" shell: pwsh run: | if (!(Test-Path $env:VCPKG_DEFAULT_BINARY_CACHE)) { diff --git a/scripts/vcpkg b/scripts/vcpkg index bbaf7862..86e68640 160000 --- a/scripts/vcpkg +++ b/scripts/vcpkg @@ -1 +1 @@ -Subproject commit bbaf78620b0fde7f521e379e1631c99630365a85 +Subproject commit 86e6864051c7956d8a3f0b78024fb69f3fd276c7