diff --git a/SetupConfigure.cmake b/SetupConfigure.cmake index f125cc1932d87..7f12fa41699ce 100644 --- a/SetupConfigure.cmake +++ b/SetupConfigure.cmake @@ -256,6 +256,7 @@ if(BUILD_CONFIGURATION STREQUAL "UTEST") set(MUSE_MODULE_MUSESAMPLER OFF) set(MUSE_MODULE_NETWORK OFF) set(MUSE_MODULE_SHORTCUTS OFF) + set(MUSE_MODULE_VST OFF) set(MUE_BUILD_APPSHELL_MODULE OFF) set(MUSE_MODULE_AUTOBOT OFF) diff --git a/buildscripts/ci/linux/build.sh b/buildscripts/ci/linux/build.sh index 46d3f242e4389..afe4bbb758470 100755 --- a/buildscripts/ci/linux/build.sh +++ b/buildscripts/ci/linux/build.sh @@ -70,9 +70,6 @@ if [ "$PACKARCH" == "aarch64" ] || [ "$PACKARCH" == "armv7l" ]; then MUSESCORE_BUILD_UPDATE_MODULE="OFF" fi -# TODO: https://github.com/musescore/MuseScore/issues/11689 -BUILD_VST=OFF - echo "=== BUILD ===" MUSESCORE_REVISION=$(git rev-parse --short=7 HEAD) @@ -83,9 +80,9 @@ MUSE_APP_INSTALL_SUFFIX=$SUFFIX \ MUSESCORE_BUILD_NUMBER=$BUILD_NUMBER \ MUSESCORE_REVISION=$MUSESCORE_REVISION \ MUSESCORE_CRASHREPORT_URL=$CRASH_REPORT_URL \ -MUSESCORE_BUILD_VST_MODULE=$BUILD_VST \ MUSESCORE_BUILD_CRASHPAD_CLIENT=${MUSESCORE_BUILD_CRASHPAD_CLIENT:-"ON"} \ MUSESCORE_BUILD_UPDATE_MODULE=${MUSESCORE_BUILD_UPDATE_MODULE:-"ON"} \ +MUSESCORE_BUILD_VST_MODULE="ON" \ MUSESCORE_BUILD_WEBSOCKET="ON" \ bash ./ninja_build.sh -t appimage diff --git a/buildscripts/ci/linux/build_utest.sh b/buildscripts/ci/linux/build_utest.sh index c1111f8c63132..ac6e19edfa0ff 100644 --- a/buildscripts/ci/linux/build_utest.sh +++ b/buildscripts/ci/linux/build_utest.sh @@ -42,9 +42,6 @@ done cat $BUILD_TOOLS/environment.sh source $BUILD_TOOLS/environment.sh -# TODO: https://github.com/musescore/MuseScore/issues/11689 -BUILD_VST=OFF - TESTS_ENABLE_CODE_COVERAGE=OFF TESTS_COMPILE_USE_UNITY=ON @@ -64,7 +61,6 @@ MUSESCORE_BUILD_CONFIGURATION=utest \ MUSE_APP_BUILD_MODE=dev \ MUSESCORE_BUILD_NUMBER=$BUILD_NUMBER \ MUSESCORE_REVISION=$MUSESCORE_REVISION \ -MUSESCORE_BUILD_VST_MODULE=$BUILD_VST \ MUSESCORE_DOWNLOAD_SOUNDFONT=OFF \ MUSESCORE_BUILD_UNIT_TESTS=ON \ MUSESCORE_UNIT_TESTS_ENABLE_CODE_COVERAGE=$TESTS_ENABLE_CODE_COVERAGE \