diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 773a823b4ac..7fbea5e0968 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,8 +48,8 @@ jobs: -DMODPLUG=ON -DQT6=ON -DWAVPACK=ON - -DVCPKG_TARGET_TRIPLET=x64-osx-min1015 - -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015 + -DVCPKG_TARGET_TRIPLET=x64-osx-min1015-release + -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015-release # TODO: Fix this broken test on macOS ctest_args: --exclude-regex DirectoryDAOTest.relocateDirectory cpack_generator: DragNDrop @@ -72,8 +72,8 @@ jobs: -DMODPLUG=ON -DQT6=ON -DWAVPACK=ON - -DVCPKG_TARGET_TRIPLET=arm64-osx-min1100 - -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015 + -DVCPKG_TARGET_TRIPLET=arm64-osx-min1100-release + -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015-release # TODO: Fix this broken test on macOS crosscompile: true cpack_generator: DragNDrop @@ -102,8 +102,8 @@ jobs: -DMODPLUG=ON -DQT6=ON -DWAVPACK=ON - -DVCPKG_TARGET_TRIPLET=x64-windows - -DVCPKG_DEFAULT_HOST_TRIPLET=x64-windows + -DVCPKG_TARGET_TRIPLET=x64-windows-release + -DVCPKG_DEFAULT_HOST_TRIPLET=x64-windows-release cc: cl cxx: cl # TODO: Fix these broken tests on Windows diff --git a/tools/macos_buildenv.sh b/tools/macos_buildenv.sh index 380e52dbe47..e3a5e834177 100755 --- a/tools/macos_buildenv.sh +++ b/tools/macos_buildenv.sh @@ -20,21 +20,21 @@ THIS_SCRIPT_NAME=${BASH_SOURCE[0]} [ -z "$THIS_SCRIPT_NAME" ] && THIS_SCRIPT_NAME=$0 if [ -n "${BUILDENV_ARM64}" ]; then - VCPKG_TARGET_TRIPLET="arm64-osx-min1100" + VCPKG_TARGET_TRIPLET="arm64-osx-min1100-release" BUILDENV_BRANCH="2.5-rel" - BUILDENV_NAME="mixxx-deps-rel-2.5-$VCPKG_TARGET_TRIPLET-62ca59f" - BUILDENV_SHA256="8f8056f81ff434f418e890fdbbff97989b2f910d903a4616a65b22315ded3789" + BUILDENV_NAME="mixxx-deps-2.5-$VCPKG_TARGET_TRIPLET-bea61fb" + BUILDENV_SHA256="0c99cf740f16fd3a1b81ad17c5dcc94e9d18c6cdc92c3f6ca058fe0297a7cddd" else if [ -n "${BUILDENV_RELEASE}" ]; then - VCPKG_TARGET_TRIPLET="x64-osx-min1015" + VCPKG_TARGET_TRIPLET="x64-osx-min1015-release" BUILDENV_BRANCH="2.5-rel" - BUILDENV_NAME="mixxx-deps-rel-2.5-$VCPKG_TARGET_TRIPLET-62ca59f" - BUILDENV_SHA256="07fec8adc5f37c061c4eb24b64b8271e4ca711cb3a4c17182630237a9cfeeab3" + BUILDENV_NAME="mixxx-deps-2.5-$VCPKG_TARGET_TRIPLET-bea61fb" + BUILDENV_SHA256="48c89e22e3c82b299d2e216a7a73c52a7b1c6961a2cce883df120ce610c09403" else VCPKG_TARGET_TRIPLET="x64-osx-min1015" BUILDENV_BRANCH="2.5" - BUILDENV_NAME="mixxx-deps-2.5-$VCPKG_TARGET_TRIPLET-46ec071" - BUILDENV_SHA256="968a6bc445ad0cb99c4d310dc7831f20cb1ac641873ae4990b24a369d2971360" + BUILDENV_NAME="mixxx-deps-2.5-$VCPKG_TARGET_TRIPLET-5d58718" + BUILDENV_SHA256="c0b6d25c9bb5f7951014a06a03371e4190e0f8977805bf56c09dfa1ef2b285ae" fi fi diff --git a/tools/windows_buildenv.bat b/tools/windows_buildenv.bat index 62be59a2e84..8afb2082be4 100644 --- a/tools/windows_buildenv.bat +++ b/tools/windows_buildenv.bat @@ -22,14 +22,15 @@ IF NOT DEFINED INSTALL_ROOT ( IF DEFINED BUILDENV_RELEASE ( SET BUILDENV_BRANCH=2.5-rel - SET VCPKG_TARGET_TRIPLET=x64-windows - SET BUILDENV_NAME=mixxx-deps-rel-2.5-x64-windows-62ca59f - SET BUILDENV_SHA256=e0beb24c419b14c1439c9a4dfbe58e4d0e4aafd998ea4ba5207ccda9d36c8730 + SET VCPKG_TARGET_TRIPLET=x64-windows-release + vcpkg_update_main + SET BUILDENV_NAME=mixxx-deps-2.5-x64-windows-release-bea61fb + SET BUILDENV_SHA256=b7a5d8bda8f45d5d7760f872096850fa2583ddc4535ae5505b0aaa7d5a8f0cb0 ) ELSE ( SET BUILDENV_BRANCH=2.5 SET VCPKG_TARGET_TRIPLET=x64-windows - SET BUILDENV_NAME=mixxx-deps-2.5-x64-windows-46ec071 - SET BUILDENV_SHA256=5025fe217374b329b8d57a695502c68dbf5a7fec56fbb118b8c900a1288c0ffa + SET BUILDENV_NAME=mixxx-deps-2.5-x64-windows-5d58718 + SET BUILDENV_SHA256=e7f07aefa6d78259c6e92540c7fa76246a7fa600b76143579f10a29d7b3e7d81 ) IF "%~1"=="" (