switched on mu4 by default

This commit is contained in:
Igor Korsukov 2020-10-19 13:54:31 +02:00
parent 2ccb496afe
commit d81bf26f4d
6 changed files with 9 additions and 8 deletions

View file

@ -57,7 +57,7 @@ jobs:
- name: Build
run: |
T_ID=${{ secrets.TELEMETRY_TRACK_ID }}; if [ -z "$T_ID" ]; then T_ID="''"; fi
sudo bash ./build/ci/linux/build.sh -n ${{ github.run_id }} --telemetry $T_ID
sudo bash ./build/ci/linux/build.sh -n ${{ github.run_id }} --telemetry $T_ID --build_mu4 OFF
- name: Run mtests
run: |
# At moment build and run mtests consume 13.4 Gb of the disk.

View file

@ -75,7 +75,7 @@ jobs:
- name: Build
run: |
T_ID=${{ secrets.TELEMETRY_TRACK_ID }}; if [ -z "$T_ID" ]; then T_ID="''"; fi
bash ./build/ci/macos/build.sh -n ${{ github.run_id }} --telemetry $T_ID
bash ./build/ci/macos/build.sh -n ${{ github.run_id }} --telemetry $T_ID --build_mu4 OFF
- name: Package
run: |
S_S="${{ secrets.MAC_SIGN_CERTIFICATE_ENCRYPT_SECRET }}"; if [ -z "$S_S" ]; then S_S="''"; fi

View file

@ -43,7 +43,7 @@ jobs:
if: contains( env.found, '1')
run: |
. ./../musescore_environment.sh
make installdebug CPUS=2 PREFIX="$HOME/software" COVERAGE=ON
make installdebug CPUS=2 PREFIX="$HOME/software" BUILD_UI_MU4=OFF COVERAGE=ON
- name: Build reference branch
if: contains( env.found, '1')
run: |
@ -51,7 +51,7 @@ jobs:
git checkout $BASEREF
. ./../musescore_environment.sh
make clean
make installdebug CPUS=2 PREFIX="$HOME/softwarebase" COVERAGE=ON 2>/dev/null
make installdebug CPUS=2 PREFIX="$HOME/softwarebase" BUILD_UI_MU4=OFF COVERAGE=ON 2>/dev/null
- name: Run reference vtests
if: contains( env.found, '1')
run: |

View file

@ -63,7 +63,7 @@ jobs:
run: |
IF ${{ secrets.TELEMETRY_TRACK_ID != 0 }} == true ( SET T_ID=${{ secrets.TELEMETRY_TRACK_ID }} ) ELSE ( SET T_ID="''" )
IF ${{ secrets.CRASH_LOG_SERVER_URL != 0 }} == true ( SET C_URL=${{ secrets.CRASH_LOG_SERVER_URL }} ) ELSE ( SET C_URL="''" )
build\ci\windows\build.bat -n ${{ github.run_id }} --telemetry %T_ID% --crashurl %C_URL%
build\ci\windows\build.bat -n ${{ github.run_id }} --telemetry %T_ID% --crashurl %C_URL% --build_mu4 OFF
- name: Package
shell: cmd
run: |

View file

@ -59,7 +59,7 @@ if (MSVC)
set (MINGW false)
endif (MSVC)
option(BUILD_UI_MU4 "Build Modern UI MuseScore 4" OFF)
option(BUILD_UI_MU4 "Build Modern UI MuseScore 4" ON)
# We need this early, before FindQt5
option(BUILD_WEBENGINE "Built in webengine support" ON)

View file

@ -102,8 +102,9 @@ debug:
-DBUILD_PORTAUDIO="${BUILD_PORTAUDIO}" \
-DBUILD_WEBENGINE="${BUILD_WEBENGINE}" \
-DUSE_SYSTEM_FREETYPE="${USE_SYSTEM_FREETYPE}" \
-DCOVERAGE="${COVERAGE}" \
-DDOWNLOAD_SOUNDFONT="${DOWNLOAD_SOUNDFONT}" \
-DCOVERAGE="${COVERAGE}" \
-DDOWNLOAD_SOUNDFONT="${DOWNLOAD_SOUNDFONT}" \
-DBUILD_UI_MU4="${BUILD_UI_MU4}" \
-DCMAKE_SKIP_RPATH="${NO_RPATH}" ..; \
make lrelease; \
make -j ${CPUS}; \