From 927635d327d58746068cb35e362872ebff812d7b Mon Sep 17 00:00:00 2001 From: Peter Jonas Date: Sat, 10 Aug 2024 14:02:53 +0200 Subject: [PATCH] GitHub Actions: Tidy workflow files Backport of #23955 Disable translate_tx_pull_to_s3.yml --- .../{ci_linux.yml => build_linux.yml} | 8 +++---- .../{ci_macos.yml => build_macos.yml} | 10 ++++---- .../{ci_windows.yml => build_windows.yml} | 24 +++++++++---------- .../{ci_vtests.yml => check_visual_tests.yml} | 2 +- ...date.yml => translate_lupdate_tx_push.yml} | 2 +- ..._tx2s3.yml => translate_tx_pull_to_s3.yml} | 6 ++--- build/ci/linux/build.sh | 10 ++++---- build/ci/linux/package.sh | 14 +++++------ build/ci/macos/build.sh | 8 +++---- build/ci/macos/package.sh | 10 ++++---- build/ci/tools/make_build_mode_env.sh | 22 ++++++++--------- build/ci/tools/osuosl/publish.sh | 16 ++++++------- build/ci/windows/build.bat | 8 +++---- build/ci/windows/package.bat | 14 +++++------ 14 files changed, 77 insertions(+), 77 deletions(-) rename .github/workflows/{ci_linux.yml => build_linux.yml} (95%) rename .github/workflows/{ci_macos.yml => build_macos.yml} (94%) rename .github/workflows/{ci_windows.yml => build_windows.yml} (90%) rename .github/workflows/{ci_vtests.yml => check_visual_tests.yml} (99%) rename .github/workflows/{ci_lupdate.yml => translate_lupdate_tx_push.yml} (94%) rename .github/workflows/{ci_tx2s3.yml => translate_tx_pull_to_s3.yml} (92%) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/build_linux.yml similarity index 95% rename from .github/workflows/ci_linux.yml rename to .github/workflows/build_linux.yml index f163d8f06a6ad..9366d956800b3 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/build_linux.yml @@ -1,4 +1,4 @@ -name: CI_Linux +name: 'Build: Linux and run the unit tests (mtests)' on: push: @@ -12,9 +12,9 @@ on: workflow_dispatch: inputs: build_mode: - description: 'Build mode: devel_build, nightly_build, testing_build, stable_build' + description: 'Build mode: devel, nightly, testing, stable' required: true - default: 'devel_build' + default: 'devel' publish: description: 'Publish to FTP: on - publish' required: false @@ -38,7 +38,7 @@ jobs: DO_BUILD='true' DO_PUBLISH='false' - if [[ "${{ github.event.inputs.publish }}" == "on" || "$BUILD_MODE" == "nightly_build" ]]; then + if [[ "${{ github.event.inputs.publish }}" == "on" || "$BUILD_MODE" == "nightly" ]]; then DO_PUBLISH='true' if [ -z "${{ secrets.OSUOSL_SSH_ENCRYPT_SECRET }}" ]; then echo "warning: not set OSUOSL_SSH_ENCRYPT_SECRET, publish disabled" diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/build_macos.yml similarity index 94% rename from .github/workflows/ci_macos.yml rename to .github/workflows/build_macos.yml index 3ecb23a371d84..4fe665f024fa7 100644 --- a/.github/workflows/ci_macos.yml +++ b/.github/workflows/build_macos.yml @@ -1,4 +1,4 @@ -name: CI_MacOS +name: 'Build: macOS' on: push: @@ -12,9 +12,9 @@ on: workflow_dispatch: inputs: build_mode: - description: 'Build mode: devel_build, nightly_build, testing_build, stable_build' + description: 'Build mode: devel, nightly, testing, stable' required: true - default: 'devel_build' + default: 'devel' publish: description: 'Publish to FTP: on - publish' required: false @@ -41,7 +41,7 @@ jobs: BUILD_MODE=$(cat ./build.artifacts/env/build_mode.env) DO_PUBLISH='false' - if [[ "${{ github.event.inputs.publish }}" == "on" || "$BUILD_MODE" == "nightly_build" ]]; then + if [[ "${{ github.event.inputs.publish }}" == "on" || "$BUILD_MODE" == "nightly" ]]; then DO_PUBLISH='true' if [ -z "${{ secrets.OSUOSL_SSH_ENCRYPT_SECRET }}" ]; then echo "warning: not set OSUOSL_SSH_ENCRYPT_SECRET, publish disabled" @@ -50,7 +50,7 @@ jobs: fi DO_NOTARIZE='false' - if [ "$BUILD_MODE" != "devel_build" ]; then + if [ "$BUILD_MODE" != "devel" ]; then DO_NOTARIZE='true' if [ -z "${{ secrets.APPLE_USERNAME }}" ]; then echo "warning: not set APPLE_USERNAME, notarize disabled" diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/build_windows.yml similarity index 90% rename from .github/workflows/ci_windows.yml rename to .github/workflows/build_windows.yml index 941bea8241747..c7f8d356a8ed0 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/build_windows.yml @@ -1,4 +1,4 @@ -name: CI_Windows +name: 'Build: Windows' on: push: @@ -12,9 +12,9 @@ on: workflow_dispatch: inputs: build_mode: - description: 'Build mode: devel_build, nightly_build, testing_build, stable_build' + description: 'Build mode: devel, nightly, testing, stable' required: true - default: 'devel_build' + default: 'devel' publish: description: 'Publish to FTP: on - publish' required: false @@ -39,7 +39,7 @@ jobs: BUILD_MODE=$(cat ./build.artifacts/env/build_mode.env) DO_PUBLISH='false' - if [[ "${{ github.event.inputs.publish }}" == "on" || "$BUILD_MODE" == "nightly_build" ]]; then + if [[ "${{ github.event.inputs.publish }}" == "on" || "$BUILD_MODE" == "nightly" ]]; then DO_PUBLISH='true' if [ -z "${{ secrets.OSUOSL_SSH_ENCRYPT_SECRET }}" ]; then echo "warning: not set OSUOSL_SSH_ENCRYPT_SECRET, publish disabled" @@ -48,10 +48,10 @@ jobs: fi DO_CHECKSUM='true' - if [ "$BUILD_MODE" == "devel_build" ]; then DO_CHECKSUM='false'; fi + if [ "$BUILD_MODE" == "devel" ]; then DO_CHECKSUM='false'; fi DO_APPCAST='true' - if [ "$BUILD_MODE" == "devel_build" ]; then DO_APPCAST='false'; fi + if [ "$BUILD_MODE" == "devel" ]; then DO_APPCAST='false'; fi DO_BUILD='true' @@ -83,7 +83,7 @@ jobs: run: | IF ${{ secrets.WIN_SIGN_CERTIFICATE_ENCRYPT_SECRET != 0 }} == true ( SET S_S=${{ secrets.WIN_SIGN_CERTIFICATE_ENCRYPT_SECRET }} ) ELSE ( SET S_S="''" ) IF ${{ secrets.WIN_SIGN_CERTIFICATE_PASSWORD != 0 }} == true ( SET S_P=${{ secrets.WIN_SIGN_CERTIFICATE_PASSWORD }} ) ELSE ( SET S_P="''" ) - IF ${{ env.BUILD_MODE }} == stable_build ( SET GUID=${{ secrets.WIN_MSI_STABLE_GUID }} ) ELSE ( SET GUID=${{ secrets.WIN_MSI_TESTING_GUID }} ) + IF ${{ env.BUILD_MODE }} == stable( SET GUID=${{ secrets.WIN_MSI_STABLE_GUID }} ) ELSE ( SET GUID=${{ secrets.WIN_MSI_TESTING_GUID }} ) build\ci\windows\package.bat --signsecret %S_S% --signpass %S_P% --guid %GUID% - name: Checksum if: env.DO_CHECKSUM == 'true' @@ -128,11 +128,11 @@ jobs: echo "BUILD_MODE=$BUILD_MODE" >> $GITHUB_ENV DO_BUILD='false' - if [[ "$BUILD_MODE" == "testing_build" || "$BUILD_MODE" == "stable_build" ]]; then + if [[ "$BUILD_MODE" == "testing" || "$BUILD_MODE" == "stable" ]]; then DO_BUILD='true' fi DO_BUILD='true' - echo "!! ATTENTION !! Windows x32 build run only for 'testing_build' and 'stable_build', and SKIP for 'pull requests' and nightly" + echo "!! ATTENTION !! Windows x32 build run only for 'testing' and 'stable', and SKIP for 'pull requests' and nightly" echo "DO_BUILD=$DO_BUILD" >> $GITHUB_ENV echo "DO_BUILD: $DO_BUILD" @@ -164,7 +164,7 @@ jobs: run: | IF ${{ secrets.WIN_SIGN_CERTIFICATE_ENCRYPT_SECRET != 0 }} == true ( SET S_S=${{ secrets.WIN_SIGN_CERTIFICATE_ENCRYPT_SECRET }} ) ELSE ( SET S_S="''" ) IF ${{ secrets.WIN_SIGN_CERTIFICATE_PASSWORD != 0 }} == true ( SET S_P=${{ secrets.WIN_SIGN_CERTIFICATE_PASSWORD }} ) ELSE ( SET S_P="''" ) - IF ${{ env.BUILD_MODE }} == stable_build ( SET GUID=${{ secrets.WIN_MSI_STABLE_GUID }} ) ELSE ( SET GUID=${{ secrets.WIN_MSI_TESTING_GUID }} ) + IF ${{ env.BUILD_MODE }} == stable ( SET GUID=${{ secrets.WIN_MSI_STABLE_GUID }} ) ELSE ( SET GUID=${{ secrets.WIN_MSI_TESTING_GUID }} ) build\ci\windows\package.bat -b 32 --signsecret %S_S% --signpass %S_P% --guid %GUID% - name: Checksum if: env.DO_BUILD == 'true' @@ -208,10 +208,10 @@ jobs: echo "BUILD_MODE=$BUILD_MODE" >> $GITHUB_ENV DO_BUILD='false' - if [[ "$BUILD_MODE" == "testing_build" || "$BUILD_MODE" == "stable_build" ]]; then + if [[ "$BUILD_MODE" == "testing" || "$BUILD_MODE" == "stable" ]]; then DO_BUILD='true' fi - echo "!! ATTENTION !! Windows portable build run only for 'testing_build' and 'stable_build', and SKIP for 'pull requests' and nightly" + echo "!! ATTENTION !! Windows portable build run only for 'testing' and 'stable', and SKIP for 'pull requests' and nightly" echo "DO_BUILD=$DO_BUILD" >> $GITHUB_ENV echo "DO_BUILD: $DO_BUILD" diff --git a/.github/workflows/ci_vtests.yml b/.github/workflows/check_visual_tests.yml similarity index 99% rename from .github/workflows/ci_vtests.yml rename to .github/workflows/check_visual_tests.yml index a93cf60df93a8..1d06e8dfdf66c 100644 --- a/.github/workflows/ci_vtests.yml +++ b/.github/workflows/check_visual_tests.yml @@ -1,4 +1,4 @@ -name: CI_vtests +name: 'Check: Visual Tests (vtests)' on: pull_request: diff --git a/.github/workflows/ci_lupdate.yml b/.github/workflows/translate_lupdate_tx_push.yml similarity index 94% rename from .github/workflows/ci_lupdate.yml rename to .github/workflows/translate_lupdate_tx_push.yml index 4e0542e26e195..2553d6ce7f01b 100644 --- a/.github/workflows/ci_lupdate.yml +++ b/.github/workflows/translate_lupdate_tx_push.yml @@ -1,4 +1,4 @@ -name: CI_Run_lupdate_to_tx +name: 'Translate: lupdate source TS in repo and tx push new strings to Transifex' on: # pull_request: diff --git a/.github/workflows/ci_tx2s3.yml b/.github/workflows/translate_tx_pull_to_s3.yml similarity index 92% rename from .github/workflows/ci_tx2s3.yml rename to .github/workflows/translate_tx_pull_to_s3.yml index b26499b720631..ecbda30ea0111 100644 --- a/.github/workflows/ci_tx2s3.yml +++ b/.github/workflows/translate_tx_pull_to_s3.yml @@ -1,11 +1,11 @@ -name: CI_Run_tx2s3 +name: 'Translate: tx pull translations to S3' on: pull_request: branches: - 3.x_off - schedule: - - cron: '*/15 * * * *' # Every 15 minutes + #schedule: + # - cron: '*/15 * * * *' # Every 15 minutes workflow_dispatch: jobs: diff --git a/build/ci/linux/build.sh b/build/ci/linux/build.sh index a0c6360649eb8..5bc19eac2879a 100755 --- a/build/ci/linux/build.sh +++ b/build/ci/linux/build.sh @@ -33,11 +33,11 @@ if [ -z "$BUILD_MODE" ]; then BUILD_MODE=$(cat $ARTIFACTS_DIR/env/build_mode.env MUSESCORE_BUILD_CONFIG=dev case "${BUILD_MODE}" in -"devel_build") MUSESCORE_BUILD_CONFIG=dev; SUFFIX=-dev;; -"nightly_build") MUSESCORE_BUILD_CONFIG=dev; SUFFIX=-nightly;; -"testing_build") MUSESCORE_BUILD_CONFIG=testing; SUFFIX=-testing;; -"stable_build") MUSESCORE_BUILD_CONFIG=release; SUFFIX="";; -"mtests") MUSESCORE_BUILD_CONFIG=dev; BUILDTYPE=installdebug; OPTIONS="USE_SYSTEM_FREETYPE=ON UPDATE_CACHE=FALSE PREFIX=$ARTIFACTS_DIR/software";; +"devel") MUSESCORE_BUILD_CONFIG=dev; SUFFIX=-dev;; +"nightly") MUSESCORE_BUILD_CONFIG=dev; SUFFIX=-nightly;; +"testing") MUSESCORE_BUILD_CONFIG=testing; SUFFIX=-testing;; +"stable") MUSESCORE_BUILD_CONFIG=release; SUFFIX="";; +"mtests") MUSESCORE_BUILD_CONFIG=dev; BUILDTYPE=installdebug; OPTIONS="USE_SYSTEM_FREETYPE=ON UPDATE_CACHE=FALSE PREFIX=$ARTIFACTS_DIR/software";; esac if [ "${BUILDTYPE}" == "portable" ]; then diff --git a/build/ci/linux/package.sh b/build/ci/linux/package.sh index e4a94033ffd36..605e7600c2d66 100755 --- a/build/ci/linux/package.sh +++ b/build/ci/linux/package.sh @@ -28,10 +28,10 @@ if [ -z "$BUILD_MODE" ]; then echo "error: not set BUILD_MODE"; exit 1; fi if [ -z "$BUILD_VERSION" ]; then echo "error: not set BUILD_VERSION"; exit 1; fi PACKTYPE=appimage -if [ "$BUILD_MODE" == "devel_build" ]; then PACKTYPE=appimage; fi -if [ "$BUILD_MODE" == "nightly_build" ]; then PACKTYPE=appimage; fi -if [ "$BUILD_MODE" == "testing_build" ]; then PACKTYPE=appimage; fi -if [ "$BUILD_MODE" == "stable_build" ]; then PACKTYPE=appimage; fi +if [ "$BUILD_MODE" == "devel" ]; then PACKTYPE=appimage; fi +if [ "$BUILD_MODE" == "nightly" ]; then PACKTYPE=appimage; fi +if [ "$BUILD_MODE" == "testing" ]; then PACKTYPE=appimage; fi +if [ "$BUILD_MODE" == "stable" ]; then PACKTYPE=appimage; fi MAJOR_VERSION="${BUILD_VERSION%%.*}" @@ -41,7 +41,7 @@ echo "MAJOR_VERSION: $MAJOR_VERSION" echo "PACKTYPE: $PACKTYPE" echo "INSTALL_DIR: $INSTALL_DIR" -if [ "$BUILD_MODE" == "nightly_build" ]; then +if [ "$BUILD_MODE" == "nightly" ]; then BUILD_DATETIME=$(cat $ARTIFACTS_DIR/env/build_datetime.env) BUILD_BRANCH=$(cat $ARTIFACTS_DIR/env/build_branch.env) BUILD_REVISION=$(cat $ARTIFACTS_DIR/env/build_revision.env) @@ -62,8 +62,8 @@ if [ "$PACKTYPE" == "appimage" ]; then # To enable automatic updates for AppImages, set UPDATE_INFORMATION according to # https://github.com/AppImage/AppImageSpec/blob/master/draft.md#update-information case "${BUILD_MODE}" in - "stable_build") export UPDATE_INFORMATION="gh-releases-zsync|musescore|MuseScore|latest|MuseScore-*x86_64.AppImage.zsync";; - "nightly_build") export UPDATE_INFORMATION="zsync|https://ftp.osuosl.org/pub/musescore-nightlies/linux/${MAJOR_VERSION}x/nightly/MuseScoreNightly-latest-x86_64.AppImage.zsync";; + "stable") export UPDATE_INFORMATION="gh-releases-zsync|musescore|MuseScore|latest|MuseScore-*x86_64.AppImage.zsync";; + "nightly") export UPDATE_INFORMATION="zsync|https://ftp.osuosl.org/pub/musescore-nightlies/linux/${MAJOR_VERSION}x/nightly/MuseScoreNightly-latest-x86_64.AppImage.zsync";; *) unset UPDATE_INFORMATION;; # disable updates for other build modes esac diff --git a/build/ci/macos/build.sh b/build/ci/macos/build.sh index 093b52123fb57..ea822fa4a2553 100644 --- a/build/ci/macos/build.sh +++ b/build/ci/macos/build.sh @@ -25,10 +25,10 @@ if [ -z "$TELEMETRY_TRACK_ID" ]; then TELEMETRY_TRACK_ID=""; fi BUILD_MODE=$(cat $ARTIFACTS_DIR/env/build_mode.env) MUSESCORE_BUILD_CONFIG=dev -if [ "$BUILD_MODE" == "devel_build" ]; then MUSESCORE_BUILD_CONFIG=dev; fi -if [ "$BUILD_MODE" == "nightly_build" ]; then MUSESCORE_BUILD_CONFIG=dev; fi -if [ "$BUILD_MODE" == "testing_build" ]; then MUSESCORE_BUILD_CONFIG=testing; fi -if [ "$BUILD_MODE" == "stable_build" ]; then +if [ "$BUILD_MODE" == "devel" ]; then MUSESCORE_BUILD_CONFIG=dev; fi +if [ "$BUILD_MODE" == "nightly" ]; then MUSESCORE_BUILD_CONFIG=dev; fi +if [ "$BUILD_MODE" == "testing" ]; then MUSESCORE_BUILD_CONFIG=testing; fi +if [ "$BUILD_MODE" == "stable" ]; then MUSESCORE_BUILD_CONFIG=release; BUILD_AUTOUPDATE=ON fi diff --git a/build/ci/macos/package.sh b/build/ci/macos/package.sh index ede83cc72dd59..a3046ab0df4a4 100644 --- a/build/ci/macos/package.sh +++ b/build/ci/macos/package.sh @@ -58,19 +58,19 @@ VERSION_PATCH="$(cut -d'.' -f3 <<<"$BUILD_VERSION")" APP_LONGER_NAME="MuseScore $VERSION_MAJOR" PACKAGE_VERSION="$BUILD_VERSION" -if [ "$BUILD_MODE" == "devel_build" ]; then +if [ "$BUILD_MODE" == "devel" ]; then APP_LONGER_NAME="MuseScore $BUILD_VERSION Devel" PACKAGE_VERSION="${VERSION_MAJOR}.${VERSION_MINOR}b-${BUILD_REVISION}" fi -if [ "$BUILD_MODE" == "nightly_build" ]; then +if [ "$BUILD_MODE" == "nightly" ]; then APP_LONGER_NAME="MuseScore $BUILD_VERSION Nightly"; PACKAGE_VERSION="${VERSION_MAJOR}.${VERSION_MINOR}b-${BUILD_REVISION}" fi -if [ "$BUILD_MODE" == "testing_build" ]; then +if [ "$BUILD_MODE" == "testing" ]; then APP_LONGER_NAME="MuseScore $BUILD_VERSION Testing"; PACKAGE_VERSION="${VERSION_MAJOR}.${VERSION_MINOR}b-${BUILD_REVISION}" fi -if [ "$BUILD_MODE" == "stable_build" ]; then +if [ "$BUILD_MODE" == "stable" ]; then APP_LONGER_NAME="MuseScore $VERSION_MAJOR"; PACKAGE_VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" fi @@ -80,7 +80,7 @@ build/package_mac --longer_name "$APP_LONGER_NAME" --version "$PACKAGE_VERSION" DMGFILE="$(ls applebuild/*.dmg)" echo "DMGFILE: $DMGFILE" -if [ "$BUILD_MODE" == "nightly_build" ]; then +if [ "$BUILD_MODE" == "nightly" ]; then BUILD_DATETIME=$(cat $ARTIFACTS_DIR/env/build_datetime.env) BUILD_BRANCH=$(cat $ARTIFACTS_DIR/env/build_branch.env) diff --git a/build/ci/tools/make_build_mode_env.sh b/build/ci/tools/make_build_mode_env.sh index ecee8d792394b..ce7038feedd9b 100644 --- a/build/ci/tools/make_build_mode_env.sh +++ b/build/ci/tools/make_build_mode_env.sh @@ -17,27 +17,27 @@ done if [ -z "$BUILD_MODE" ]; then if [ -z "$EVENT" ]; then echo "error: not set EVENT"; exit 1; fi - if [ "$EVENT" == "push" ]; then BUILD_MODE=devel_build; fi - if [ "$EVENT" == "pull_request" ]; then BUILD_MODE=devel_build; fi - if [ "$EVENT" == "schedule" ]; then BUILD_MODE=nightly_build; fi + if [ "$EVENT" == "push" ]; then BUILD_MODE=devel; fi + if [ "$EVENT" == "pull_request" ]; then BUILD_MODE=devel; fi + if [ "$EVENT" == "schedule" ]; then BUILD_MODE=nightly; fi if [ "$EVENT" == "workflow_dispatch" ]; then echo "error: event workflow_dispatch, but not set BUILD_MODE"; exit 1; fi fi echo "EVENT: $EVENT" MODE_IS_VALID=0 -if [ "$BUILD_MODE" == "devel_build" ]; then MODE_IS_VALID=1; fi -if [ "$BUILD_MODE" == "nightly_build" ]; then MODE_IS_VALID=1; fi -if [ "$BUILD_MODE" == "testing_build" ]; then MODE_IS_VALID=1; fi -if [ "$BUILD_MODE" == "stable_build" ]; then MODE_IS_VALID=1; fi +if [ "$BUILD_MODE" == "devel" ]; then MODE_IS_VALID=1; fi +if [ "$BUILD_MODE" == "nightly" ]; then MODE_IS_VALID=1; fi +if [ "$BUILD_MODE" == "testing" ]; then MODE_IS_VALID=1; fi +if [ "$BUILD_MODE" == "stable" ]; then MODE_IS_VALID=1; fi if [ $MODE_IS_VALID -ne 1 ] ; then echo "error: Not valid build mode: $BUILD_MODE" echo "valid modes: " - echo " devel_build - build for developers, usually builds on pull request" - echo " nightly_build - build for testing current development, usually builds once a day" - echo " testing_build - build for testing before release (alpha, beta, rc), usually builds manually" - echo " stable_build - build for release, usually builds manually" + echo " devel - build for developers, usually builds on pull request" + echo " nightly - build for testing current development, usually builds once a day" + echo " testing - build for testing before release (alpha, beta, rc), usually builds manually" + echo " stable - build for release, usually builds manually" exit 1 fi diff --git a/build/ci/tools/osuosl/publish.sh b/build/ci/tools/osuosl/publish.sh index 083ac1c029d4d..c7b9b2a5e3662 100644 --- a/build/ci/tools/osuosl/publish.sh +++ b/build/ci/tools/osuosl/publish.sh @@ -34,10 +34,10 @@ if [[ "$OS" == "linux" || "$OS" == "windows" || "$OS" == "macos" ]]; then OS_IS_ if [ "$OS_IS_VALID" == "0" ]; then echo "error: Not valid OS: $OS, allowed: 'linux', 'windows', 'macos'"; exit 1; fi BUILD_DIR="" -if [ "$BUILD_MODE" == "nightly_build" ]; then BUILD_DIR="nightly"; else -if [ "$BUILD_MODE" == "testing_build" ]; then BUILD_DIR="testing"; else -if [ "$BUILD_MODE" == "stable_build" ]; then BUILD_DIR="stable"; else -echo "error: Not valid BUILD_MODE: $BUILD_MODE, allowed: 'nightly_build', 'testing_build', 'stable_build'"; exit 1; +if [ "$BUILD_MODE" == "nightly" ]; then BUILD_DIR="nightly"; else +if [ "$BUILD_MODE" == "testing" ]; then BUILD_DIR="testing"; else +if [ "$BUILD_MODE" == "stable" ]; then BUILD_DIR="stable"; else +echo "error: Not valid BUILD_MODE: $BUILD_MODE, allowed: 'nightly', 'testing', 'stable'"; exit 1; fi fi fi if [ -z "$ARTIFACT_NAME" ]; then echo "error: not set ARTIFACT_NAME"; exit 1; fi @@ -69,9 +69,9 @@ if [ "$OS" == "linux" ]; then if [ -f "$ARTIFACTS_DIR/${ARTIFACT_NAME}.zsync" ]; then echo "Copy ${ARTIFACTS_DIR}/${ARTIFACT_NAME}.zsync to $FTP_PATH" scp -oStrictHostKeyChecking=no -C -i $SSH_KEY $ARTIFACTS_DIR/${ARTIFACT_NAME}.zsync musescore-nightlies@ftp-osl.osuosl.org:~/ftp/$FTP_PATH - if [ "$BUILD_MODE" == "stable_build" ]; then + if [ "$BUILD_MODE" == "stable" ]; then : # Do nothing. zsync file is in the right place on OSUOSL, but don't forget to upload it to GitHub Releases with the AppImage. - elif [ "$BUILD_MODE" == "nightly_build" ]; then + elif [ "$BUILD_MODE" == "nightly" ]; then # zsync file must be available at stable URL. We don't need historic versions of this file so overwrite previous 'latest' zsync. ssh -i $SSH_KEY musescore-nightlies@ftp-osl.osuosl.org "cd ~/ftp/$FTP_PATH; mv -f ${ARTIFACT_NAME}.zsync ${LATEST_NAME}.zsync" fi @@ -83,13 +83,13 @@ echo $PUBLISH_URL > $ARTIFACTS_DIR/env/publish_url.env cat $ARTIFACTS_DIR/env/publish_url.env # Create link to latest -if [ "$BUILD_MODE" == "nightly_build" ]; then +if [ "$BUILD_MODE" == "nightly" ]; then echo "Create/update link to latest" ssh -i $SSH_KEY musescore-nightlies@ftp-osl.osuosl.org "cd ~/ftp/$FTP_PATH; ln -sf $ARTIFACT_NAME $LATEST_NAME" fi # Delete old files -if [ "$BUILD_MODE" == "nightly_build" ]; then +if [ "$BUILD_MODE" == "nightly" ]; then echo "Delete old MuseScoreNightly files" number_to_keep=42 # includes the one we just uploaded and the symlink to it if [ "$OS" == "linux" ]; then diff --git a/build/ci/windows/build.bat b/build/ci/windows/build.bat index bb2140a26f2f2..b22a433a830f6 100644 --- a/build/ci/windows/build.bat +++ b/build/ci/windows/build.bat @@ -29,10 +29,10 @@ IF NOT %TARGET_PROCESSOR_BITS% == 64 ( SET /p BUILD_MODE=<%ARTIFACTS_DIR%\env\build_mode.env SET "MUSESCORE_BUILD_CONFIG=dev" -IF %BUILD_MODE% == devel_build ( SET "MUSESCORE_BUILD_CONFIG=dev" ) ELSE ( -IF %BUILD_MODE% == nightly_build ( SET "MUSESCORE_BUILD_CONFIG=dev" ) ELSE ( -IF %BUILD_MODE% == testing_build ( SET "MUSESCORE_BUILD_CONFIG=testing" ) ELSE ( -IF %BUILD_MODE% == stable_build ( SET "MUSESCORE_BUILD_CONFIG=release" ) ELSE ( +IF %BUILD_MODE% == devel ( SET "MUSESCORE_BUILD_CONFIG=dev" ) ELSE ( +IF %BUILD_MODE% == nightly ( SET "MUSESCORE_BUILD_CONFIG=dev" ) ELSE ( +IF %BUILD_MODE% == testing ( SET "MUSESCORE_BUILD_CONFIG=testing" ) ELSE ( +IF %BUILD_MODE% == stable ( SET "MUSESCORE_BUILD_CONFIG=release" ) ELSE ( ECHO "error: unknown BUILD_MODE: %BUILD_MODE%" EXIT /b 1 )))) diff --git a/build/ci/windows/package.bat b/build/ci/windows/package.bat index dc9377554908a..8760174e3482f 100644 --- a/build/ci/windows/package.bat +++ b/build/ci/windows/package.bat @@ -47,10 +47,10 @@ IF %BUILD_WIN_PORTABLE% == ON ( :: Setup package type IF %BUILD_WIN_PORTABLE% == ON ( SET PACKAGE_TYPE="portable") ELSE ( -IF %BUILD_MODE% == devel_build ( SET PACKAGE_TYPE="7z") ELSE ( -IF %BUILD_MODE% == nightly_build ( SET PACKAGE_TYPE="7z") ELSE ( -IF %BUILD_MODE% == testing_build ( SET PACKAGE_TYPE="msi") ELSE ( -IF %BUILD_MODE% == stable_build ( SET PACKAGE_TYPE="msi") ELSE ( +IF %BUILD_MODE% == devel ( SET PACKAGE_TYPE="7z") ELSE ( +IF %BUILD_MODE% == nightly ( SET PACKAGE_TYPE="7z") ELSE ( +IF %BUILD_MODE% == testing ( SET PACKAGE_TYPE="msi") ELSE ( +IF %BUILD_MODE% == stable ( SET PACKAGE_TYPE="msi") ELSE ( ECHO "Unknown BUILD_MODE: %BUILD_MODE%" GOTO END_ERROR ))))) @@ -106,7 +106,7 @@ IF %PACKAGE_TYPE% == "dir" ( GOTO PACK_DIR ) ELSE ( :: ============================ :PACK_7z ECHO "Start 7z packing..." -IF %BUILD_MODE% == nightly_build ( +IF %BUILD_MODE% == nightly ( SET ARTIFACT_NAME=MuseScoreNightly-%BUILD_DATETIME%-%BUILD_BRANCH%-%BUILD_REVISION%-%TARGET_PROCESSOR_ARCH% ) ELSE ( SET ARTIFACT_NAME=MuseScore-%BUILD_VERSION%-%TARGET_PROCESSOR_ARCH% @@ -151,7 +151,7 @@ sed -i 's/00000000-0000-0000-0000-000000000000/%PACKAGE_UUID%/' build/Packaging. sed -i 's/11111111-1111-1111-1111-111111111111/%UPGRADE_UUID%/' build/Packaging.cmake SET PACKAGE_FILE_ASSOCIATION=OFF -IF %BUILD_MODE% == stable_build ( +IF %BUILD_MODE% == stable ( SET PACKAGE_FILE_ASSOCIATION=ON ) cd "%BUILD_DIR%" @@ -179,7 +179,7 @@ for /r %%i in (%BUILD_DIR%\*.msi) do ( SET "FILEPATH=%%i"d ) -IF %BUILD_MODE% == nightly_build ( +IF %BUILD_MODE% == nightly ( SET ARTIFACT_NAME=MuseScoreNightly-%BUILD_DATETIME%-%BUILD_BRANCH%-%BUILD_REVISION%-%TARGET_PROCESSOR_ARCH%.msi ) ELSE ( SET ARTIFACT_NAME=MuseScore-%BUILD_VERSION%-%TARGET_PROCESSOR_ARCH%.msi