Merge branch 'master' into fix-9476-accidental-interaction

musescore · Dec 2, 2022 · c32a099 · c32a099
2 parents 944479b + 5200cd0
commit c32a099
Show file tree

Hide file tree

Showing 935 changed files with 2,349,543 additions and 994,111 deletions.
diff --git a/.github/workflows/ci_backend.yml b/.github/workflows/ci_backend.yml
@@ -27,7 +27,9 @@ jobs:
       run: |
         bash ./build/ci/tools/make_build_mode_env.sh -e ${{ github.event_name }} -m ${{ github.event.inputs.build_mode }}
         BUILD_MODE=$(cat ./build.artifacts/env/build_mode.env)
-        BUILD_NUMBER=${{ github.run_id }}
+
+        bash ./build/ci/tools/make_build_number.sh
+        BUILD_NUMBER=$(cat ./build.artifacts/env/build_number.env)
 
         DO_PUBLISH='false'
         if [[ "${{ github.event.inputs.publish }}" == "on" ]]; then DO_PUBLISH='true'; fi

diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml
@@ -93,7 +93,7 @@ jobs:
       if: env.DO_BUILD == 'true'
       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
     - name: Package
       if: env.DO_BUILD == 'true'
       run: |

diff --git a/.github/workflows/ci_linux_mu4.yml b/.github/workflows/ci_linux_mu4.yml
@@ -5,8 +5,9 @@ on:
     branches:
     - master
 
-  schedule: 
-    - cron: '0 4 */1 */1 *' # At 04:00 on every day-of-month
+  schedule:
+    - cron: '0 3 */1 */1 *' # At 03:00 on every day-of-month for master
+    - cron: '0 5 */1 */1 *' # At 05:00 on every day-of-month for 4.0_rc
   workflow_dispatch:
     inputs:
       build_mode:
@@ -30,8 +31,14 @@ jobs:
       uses: styfle/cancel-workflow-action@0.9.1
       with:
         access_token: ${{ github.token }}
-    - name: Clone repository
+    - name: Clone repository (default)
       uses: actions/checkout@v2
+      if: ${{ github.event_name != 'schedule' || github.event.schedule == '0 3 */1 */1 *' }}
+    - name: Clone repository (4.0_rc)
+      uses: actions/checkout@v2
+      if: ${{ github.event_name == 'schedule' && github.event.schedule == '0 5 */1 */1 *' }}
+      with:
+        ref: 4.0_rc
     - name: Ccache cache files
       uses: actions/cache@v2
       with:
@@ -47,7 +54,10 @@ jobs:
       run: |
         sudo bash ./build/ci/tools/make_build_mode_env.sh -e ${{ github.event_name }} -m ${{ github.event.inputs.build_mode }}
         BUILD_MODE=$(cat ./build.artifacts/env/build_mode.env)
- 
+
+        sudo bash ./build/ci/tools/make_build_number.sh
+        BUILD_NUMBER=$(cat ./build.artifacts/env/build_number.env)
+
         DO_PUBLISH='false'
         if [[ "${{ github.event.inputs.publish }}" == "on" || "$BUILD_MODE" == "nightly_build" ]]; then 
           DO_PUBLISH='true'
@@ -98,12 +108,16 @@ jobs:
           DO_PUBLISH='false'
         fi
 
-        if [ "${{ github.event_name }}" == "pull_request" ]; then PR_INFO="_${{ github.event.pull_request.number }}_${pull_request_title}"; fi
-        UPLOAD_ARTIFACT_NAME="$(tr '":<>|*?/\\' '_' <<<"MU4_${{ github.run_id }}_Lin${PR_INFO}")"
+        ADD_INFO="_${GITHUB_REF#refs/heads/}"
+        if [ "${{ github.event_name }}" == "schedule" && "${{ github.event.schedule }}" == "0 5 */1 */1 *" }} ]; then ADD_INFO="_4.0_rc"; fi
+        if [ "${{ github.event_name }}" == "pull_request" ]; then ADD_INFO="_${{ github.event.pull_request.number }}_${pull_request_title}"; fi
+        UPLOAD_ARTIFACT_NAME="$(tr '":<>|*?/\\' '_' <<<"MU4_${BUILD_NUMBER}_Lin${ADD_INFO}")"
 
         echo "github.repository: ${{ github.repository }}"
         echo "BUILD_MODE=$BUILD_MODE" >> $GITHUB_ENV
         echo "BUILD_MODE: $BUILD_MODE"
+        echo "BUILD_NUMBER=$BUILD_NUMBER" >> $GITHUB_ENV
+        echo "BUILD_NUMBER: $BUILD_NUMBER"
         echo "DO_BUILD=$DO_BUILD" >> $GITHUB_ENV
         echo "DO_BUILD: $DO_BUILD"
         echo "DO_UPDATE_TS=$DO_UPDATE_TS" >> $GITHUB_ENV
@@ -147,7 +161,7 @@ jobs:
       run: |
         YT_API_KEY=${{ secrets.YOUTUBE_API_KEY }}; if [ -z "$YT_API_KEY" ]; then YT_API_KEY="''"; fi
         C_URL=${SENTRY_URL}; if [ -z "$C_URL" ]; then C_URL="''"; fi
-        sudo bash ./build/ci/linux/build.sh -n ${{ github.run_id }} --youtube_api_key $YT_API_KEY --crash_log_url $C_URL
+        sudo bash ./build/ci/linux/build.sh -n ${{ env.BUILD_NUMBER }} --youtube_api_key $YT_API_KEY --crash_log_url $C_URL
         echo "============== ccache ==============="
         ccache -s
     - name: Generate dump symbols

diff --git a/.github/workflows/ci_lupdate.yml b/.github/workflows/ci_lupdate.yml
@@ -15,6 +15,9 @@ jobs:
       uses: actions/checkout@v2
     - name: "Configure workflow"
       run: |
+        bash ./build/ci/tools/make_build_number.sh
+        BUILD_NUMBER=$(cat ./build.artifacts/env/build_number.env)
+
         DO_PUBLISH='false'
         if [ "${{ github.event.inputs.publish }}" == "on" ]; then 
           DO_PUBLISH='true'
@@ -26,6 +29,8 @@ jobs:
 
         echo "DO_PUBLISH=$DO_PUBLISH" >> $GITHUB_ENV
         echo "DO_PUBLISH: $DO_PUBLISH"
+        echo "BUILD_NUMBER=$BUILD_NUMBER" >> $GITHUB_ENV
+        echo "BUILD_NUMBER: $BUILD_NUMBER"
   
     - name: Setup environment
       run: |
@@ -41,5 +46,5 @@ jobs:
     - name: Upload artifacts on GitHub
       uses: actions/upload-artifact@v2
       with:
-        name: MuseScore_tsfiles_${{ github.run_id }}
+        name: MuseScore_tsfiles_${{ env.BUILD_NUMBER }}
         path: ./share/locale
diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/ci_macos.yml
@@ -91,7 +91,7 @@ jobs:
       if: env.DO_BUILD == 'true'   
       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
     - name: Package
       if: env.DO_BUILD == 'true'
       run: |

diff --git a/.github/workflows/ci_macos_mu4.yml b/.github/workflows/ci_macos_mu4.yml
@@ -5,8 +5,9 @@ on:
     branches:
     - master
 
-  schedule: 
-    - cron: '0 4 */1 */1 *' # At 04:00 on every day-of-month  
+  schedule:
+    - cron: '0 3 */1 */1 *' # At 03:00 on every day-of-month for master
+    - cron: '0 5 */1 */1 *' # At 05:00 on every day-of-month for 4.0_rc
   workflow_dispatch:
     inputs:
       build_mode:
@@ -33,8 +34,14 @@ jobs:
       uses: styfle/cancel-workflow-action@0.9.1
       with:
         access_token: ${{ github.token }}
-    - name: Clone repository
+    - name: Clone repository (default)
       uses: actions/checkout@v2
+      if: ${{ github.event_name != 'schedule' || github.event.schedule == '0 3 */1 */1 *' }}
+    - name: Clone repository (4.0_rc)
+      uses: actions/checkout@v2
+      if: ${{ github.event_name == 'schedule' && github.event.schedule == '0 5 */1 */1 *' }}
+      with:
+        ref: 4.0_rc
     - name: Ccache cache files
       uses: actions/cache@v2
       with:
@@ -51,6 +58,9 @@ jobs:
         bash ./build/ci/tools/make_build_mode_env.sh -e ${{ github.event_name }} -m ${{ github.event.inputs.build_mode }}
         BUILD_MODE=$(cat ./build.artifacts/env/build_mode.env)
 
+        bash ./build/ci/tools/make_build_number.sh
+        BUILD_NUMBER=$(cat ./build.artifacts/env/build_number.env)
+
         DO_PUBLISH='false'
         if [[ "${{ github.event.inputs.publish }}" == "on" || "$BUILD_MODE" == "nightly_build" ]]; then 
           DO_PUBLISH='true'
@@ -115,12 +125,16 @@ jobs:
           DO_PUBLISH='false'
         fi
 
-        if [ "${{ github.event_name }}" == "pull_request" ]; then PR_INFO="_${{ github.event.pull_request.number }}_${pull_request_title}"; fi
-        UPLOAD_ARTIFACT_NAME="$(tr '":<>|*?/\\' '_' <<<"MU4_${{ github.run_id }}_Mac${PR_INFO}")"
+        ADD_INFO="_${GITHUB_REF#refs/heads/}"
+        if [ "${{ github.event_name }}" == "schedule" && "${{ github.event.schedule }}" == "0 5 */1 */1 *" }} ]; then ADD_INFO="_4.0_rc"; fi
+        if [ "${{ github.event_name }}" == "pull_request" ]; then ADD_INFO="_${{ github.event.pull_request.number }}_${pull_request_title}"; fi
+        UPLOAD_ARTIFACT_NAME="$(tr '":<>|*?/\\' '_' <<<"MU4_${BUILD_NUMBER}_Mac${ADD_INFO}")"
 
         echo "github.repository: ${{ github.repository }}"
         echo "BUILD_MODE=$BUILD_MODE" >> $GITHUB_ENV
         echo "BUILD_MODE: $BUILD_MODE"
+        echo "BUILD_NUMBER=$BUILD_NUMBER" >> $GITHUB_ENV
+        echo "BUILD_NUMBER: $BUILD_NUMBER"
         echo "DO_BUILD=$DO_BUILD" >> $GITHUB_ENV
         echo "DO_BUILD: $DO_BUILD"
         echo "DO_UPDATE_TS=$DO_UPDATE_TS" >> $GITHUB_ENV
@@ -166,7 +180,7 @@ jobs:
       run: |
         YT_API_KEY=${{ secrets.YOUTUBE_API_KEY }}; if [ -z "$YT_API_KEY" ]; then YT_API_KEY="''"; fi
         C_URL=${SENTRY_URL}; if [ -z "$C_URL" ]; then C_URL="''"; fi
-        bash ./build/ci/macos/build.sh -n ${{ github.run_id }} --youtube_api_key $YT_API_KEY --crash_log_url $C_URL
+        bash ./build/ci/macos/build.sh -n ${{ env.BUILD_NUMBER }} --youtube_api_key $YT_API_KEY --crash_log_url $C_URL
         echo "============== ccache ==============="
         ccache -s
     - name: Generate dump symbols

diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml
@@ -2,6 +2,11 @@ name: Collect release info
 
 on:
   workflow_dispatch:
+    inputs:
+      mode:
+        description: 'Mode: stable, testing'
+        required: true
+        default: 'stable'
 
 defaults:
   run:
@@ -16,10 +21,18 @@ jobs:
 
       - name: Update info about the latest release in musescore-updates
         run: |
-          sudo bash ./build/ci/release/update_latest_release_info.sh \
+          S3_URL="s3://musescore-updates/feed/latest.xml"
+          if [ ${{ github.event.inputs.mode }} == "testing" ]; then
+            S3_URL="s3://musescore-updates/feed/latest.test.xml"
+          fi
+
+          sudo bash ./build/ci/release/make_release_info_file.sh \
             --token ${{ secrets.GITHUB_TOKEN }} \
             --repo ${{ github.repository }} \
-            --s3_key ${{ secrets.S3_KEY }} \
-            --s3_secret ${{ secrets.S3_SECRET }} \
-            --s3_url "s3://musescore-updates/feed/latest.xml" \
-            --s3_bucket "s3.ultimate-guitar"
+
+          sudo bash ./build/ci/release/push_file_to_s3.sh \
+            --s3_key ${{ secrets.S3_KEY_UPDATE }} \
+            --s3_secret ${{ secrets.S3_SECRET_UPDATE }} \
+            --s3_url ${S3_URL} \
+            --s3_bucket ${{ secrets.S3_BUCKET_UPDATE }} \
+            --file_name "release_info.json"
diff --git a/.github/workflows/ci_release_clear.yml b/.github/workflows/ci_release_clear.yml
@@ -0,0 +1,36 @@
+name: Clear release info
+
+on:
+  workflow_dispatch:
+    inputs:
+      mode:
+        description: 'Mode: stable, testing'
+        required: true
+        default: 'stable'
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  update-release-clear:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v2
+
+      - name: Clear info about the latest release in musescore-updates
+        run: |
+          S3_URL="s3://musescore-updates/feed/latest.xml"
+          if [ ${{ github.event.inputs.mode }} == "testing" ]; then
+            S3_URL="s3://musescore-updates/feed/latest.test.xml"
+          fi
+
+          sudo bash ./build/ci/release/make_empty_release_info_file.sh
+
+          sudo bash ./build/ci/release/push_file_to_s3.sh \
+            --s3_key ${{ secrets.S3_KEY_UPDATE }} \
+            --s3_secret ${{ secrets.S3_SECRET_UPDATE }} \
+            --s3_url ${S3_URL} \
+            --s3_bucket ${{ secrets.S3_BUCKET_UPDATE }} \
+            --file_name "release_info.json"
diff --git a/.github/workflows/ci_tx2s3.yml b/.github/workflows/ci_tx2s3.yml
@@ -18,7 +18,7 @@ jobs:
 
         if [ $DO_RUN == 'false' ]; then
           echo "not set credentials, not possible run"
-        fi  
+        fi
 
         echo "DO_RUN=$DO_RUN" >> $GITHUB_ENV
         echo "DO_RUN: $DO_RUN"
@@ -31,10 +31,16 @@ jobs:
       if: env.DO_RUN == 'true'
       run: |
         # lrelease
-        sudo bash ./build/ci/translation/qt_install.sh 
+        sudo bash ./build/ci/translation/qt_install.sh
         sudo bash ./build/ci/translation/tx_install.sh -s linux -t ${{ secrets.TRANSIFEX_API_TOKEN }}
         sudo bash ./build/ci/translation/s3_install.sh --s3_key ${{ secrets.S3_KEY }} --s3_secret ${{ secrets.S3_SECRET }}
-    
+
+        sudo bash ./build/ci/tools/make_build_number.sh
+        BUILD_NUMBER=$(cat ./build.artifacts/env/build_number.env)
+
+        echo "BUILD_NUMBER=$BUILD_NUMBER" >> $GITHUB_ENV
+        echo "BUILD_NUMBER: $BUILD_NUMBER"
+
     - name: Update .ts files (tx pull)
       if: env.DO_RUN == 'true'
       run: |
@@ -44,10 +50,10 @@ jobs:
       if: env.DO_RUN == 'true'
       run: |
         sudo bash ./build/ci/translation/s3_packandsend.sh
-        
+
     - name: Upload artifacts on GitHub
       if: env.DO_RUN == 'true'
       uses: actions/upload-artifact@v2
       with:
-        name: MuseScore_locale_${{ github.run_id }}
-        path: ./share/locale      
+        name: MuseScore_locale_${{ env.BUILD_NUMBER }}
+        path: ./share/locale
diff --git a/.github/workflows/ci_utests.yml b/.github/workflows/ci_utests.yml
@@ -19,6 +19,13 @@ jobs:
         access_token: ${{ github.token }}
     - name: Clone repository
       uses: actions/checkout@v2
+    - name: "Configure workflow"
+      run: |
+        sudo bash ./build/ci/tools/make_build_number.sh
+        BUILD_NUMBER=$(cat ./build.artifacts/env/build_number.env)
+
+        echo "BUILD_NUMBER=$BUILD_NUMBER" >> $GITHUB_ENV
+        echo "BUILD_NUMBER: $BUILD_NUMBER"
     - name: Ccache cache files
       uses: actions/cache@v2
       with:
@@ -34,7 +41,7 @@ jobs:
     - name: Build
       run: |
         mkdir -p build.artifacts/env
-        sudo bash ./build/ci/linux/build_utest.sh -n ${{ github.run_id }}
+        sudo bash ./build/ci/linux/build_utest.sh -n ${{ env.BUILD_NUMBER }}
     - name: Run tests 
       run: |
         # At moment build and run tests consume 13.4 Gb of the disk.

diff --git a/.github/workflows/ci_vtests.yml b/.github/workflows/ci_vtests.yml
@@ -20,6 +20,13 @@ jobs:
         access_token: ${{ github.token }}
     - name: Clone repository
       uses: actions/checkout@v2
+    - name: "Configure workflow"
+      run: |
+        sudo bash ./build/ci/tools/make_build_number.sh
+        BUILD_NUMBER=$(cat ./build.artifacts/env/build_number.env)
+
+        echo "BUILD_NUMBER=$BUILD_NUMBER" >> $GITHUB_ENV
+        echo "BUILD_NUMBER: $BUILD_NUMBER"
     - name: Get reference commit for PR
       if: github.event_name == 'pull_request'
       env:
@@ -47,7 +54,7 @@ jobs:
         echo "DO_RUN=${{ env.DO_RUN }}"
         echo "::set-output name=reference_sha::${{ env.REFERENCE_SHA }}"
         echo "REFERENCE_SHA=${{ env.REFERENCE_SHA }}"
-        UPLOAD_ARTIFACT_NAME="$(tr '":<>|*?/\\' '_' <<<"VTests Comparison ${{ github.run_id }}${pr_info}")"
+        UPLOAD_ARTIFACT_NAME="$(tr '":<>|*?/\\' '_' <<<"VTests Comparison ${{ env.BUILD_NUMBER }}${pr_info}")"
         echo "::set-output name=artifact_name::$UPLOAD_ARTIFACT_NAME"
         echo "UPLOAD_ARTIFACT_NAME=$UPLOAD_ARTIFACT_NAME"