Merge pull request #25016 from cbjeukendrup/qt6/next/6.8

Add Qt 6.9 support

Author: cbjeukendrup

.github/workflows/build_all.yml

@@ -24,6 +24,10 @@ on:
         description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
         default: ''
         required: false
+      use_qt69:
+        description: 'Use Qt 6.9'
+        default: 'off'
+        required: false   
   workflow_call:
     inputs:
       platforms:
@@ -50,6 +54,11 @@ on:
         default: ''
         type: string
         required: false
+      use_qt69:
+        description: 'Use Qt 6.9'
+        default: 'off'
+        type: string
+        required: false  
 
 defaults:
   run:
@@ -66,6 +75,7 @@ jobs:
       build_mode: ${{ inputs.build_mode }}
       publish: ${{ inputs.publish }}
       deploy: ${{ inputs.deploy_backend }}
+      use_qt69: ${{ inputs.use_qt69 }}
 
   linux_arm32:
     name: Linux ARM32
@@ -76,6 +86,7 @@ jobs:
       build_mode: ${{ inputs.build_mode }}
       publish: ${{ inputs.publish }}
       sentry_project: ${{ inputs.sentry_project }}
+      use_qt69: ${{ inputs.use_qt69 }}
 
   linux:
     name: Linux
@@ -86,6 +97,7 @@ jobs:
       build_mode: ${{ inputs.build_mode }}
       publish: ${{ inputs.publish }}
       sentry_project: ${{ inputs.sentry_project }}
+      use_qt69: ${{ inputs.use_qt69 }}
 
   macos:
     name: macOS
@@ -96,6 +108,7 @@ jobs:
       build_mode: ${{ inputs.build_mode }}
       publish: ${{ inputs.publish }}
       sentry_project: ${{ inputs.sentry_project }}
+      use_qt69: ${{ inputs.use_qt69 }}
 
   windows:
     name: Windows
@@ -106,6 +119,7 @@ jobs:
       build_mode: ${{ inputs.build_mode }}
       publish: ${{ inputs.publish }}
       sentry_project: ${{ inputs.sentry_project }}
+      use_qt69: ${{ inputs.use_qt69 }}
 
   # Dummy build for testing purposes.
   dummy:

.github/workflows/build_backend.yml

@@ -18,6 +18,10 @@ on:
         description: 'Deploy: on - deploy'
         default: 'off'
         required: false
+      use_qt69:
+        description: 'Use Qt 6.9'
+        default: 'off'
+        required: false   
   workflow_call:
     inputs:
       build_mode:
@@ -35,6 +39,11 @@ on:
         default: 'off'
         type: string
         required: false
+      use_qt69:
+        description: 'Use Qt 6.9'
+        default: 'off'
+        type: string
+        required: false  
 
 jobs:
   backend:
@@ -57,9 +66,9 @@ jobs:
         BUILD_NUMBER=$(cat ./build.artifacts/env/build_number.env)
 
         DO_PUBLISH='false'
-        if [ "${{ inputs.publish }}" = "on" ]; then 
+        if [ "${{ inputs.publish }}" = "on" ]; then
           DO_PUBLISH='true';
-          if [ -z "${{ secrets.S3_KEY_CONVERTER }}" ]; then 
+          if [ -z "${{ secrets.S3_KEY_CONVERTER }}" ]; then
             echo "::warning::S3_KEY_CONVERTER is empty; publishing to S3 disabled"
             DO_PUBLISH='false'
           fi
@@ -77,7 +86,7 @@ jobs:
         bash ./buildscripts/ci/tools/make_version_env.sh $BUILD_NUMBER
         VERSION=$(cat ./build.artifacts/env/build_version.env)
         GITHUB_ARTIFACT_NAME="MuseScore-${VERSION}"
-        
+
         VERSION_MAJOR_MINOR=$(echo "$VERSION" | cut -d '.' -f 1,2)
 
         echo "github.repository: ${{ github.repository }}"
@@ -89,6 +98,15 @@ jobs:
         echo "VERSION_MAJOR_MINOR=$VERSION_MAJOR_MINOR" | tee -a $GITHUB_ENV
         echo "GITHUB_ARTIFACT_NAME=$GITHUB_ARTIFACT_NAME" | tee -a $GITHUB_ENV
 
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
+        host: 'linux'
+        target: 'desktop'
+        arch: 'linux_gcc_64'
+        modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
+
     - name: Setup environment
       run: |
         bash ./buildscripts/ci/backend/setup.sh
@@ -109,7 +127,7 @@ jobs:
           --s3_secret ${{ secrets.S3_SECRET_CONVERTER }} \
           --stage ${{ inputs.build_mode }} \
           --mu_version ${{ env.VERSION }} \
-          --mu_version_major_minor ${{ env.VERSION_MAJOR_MINOR }}  
+          --mu_version_major_minor ${{ env.VERSION_MAJOR_MINOR }}
 
     - name: Build Docker (used package from S3)
       if: env.DO_PUBLISH == 'true'

.github/workflows/build_linux.yml

@@ -20,6 +20,10 @@ on:
         description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
         default: ''
         required: false
+      use_qt69:
+        description: 'Use Qt 6.9'
+        default: 'off'
+        required: false  
   workflow_call:
     inputs:
       platforms:
@@ -42,6 +46,11 @@ on:
         default: ''
         type: string
         required: false
+      use_qt69:
+        description: 'Use Qt 6.9'
+        default: 'off'
+        type: string
+        required: false    
 
 jobs:
   build:
@@ -50,22 +59,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: ${{ 
-          (github.event_name != 'workflow_dispatch' 
-           || (contains(inputs.platforms, 'linux_x64') && contains(inputs.platforms, 'linux_arm64'))) 
-          && fromJson('["linux_x64","linux_arm64"]') 
-          || (contains(inputs.platforms, 'linux_x64') && fromJson('["linux_x64"]') 
-          || (contains(inputs.platforms, 'linux_arm64') && fromJson('["linux_arm64"]') 
-          || fromJson('[]'))) 
+        platform: ${{
+          (github.event_name != 'workflow_dispatch'
+           || (contains(inputs.platforms, 'linux_x64') && contains(inputs.platforms, 'linux_arm64')))
+          && fromJson('["linux_x64","linux_arm64"]')
+          || (contains(inputs.platforms, 'linux_x64') && fromJson('["linux_x64"]')
+          || (contains(inputs.platforms, 'linux_arm64') && fromJson('["linux_arm64"]')
+          || fromJson('[]')))
           }}
         include:
           - platform: linux_x64
             arch: x86_64
             runs-on: ubuntu-22.04
+            qt-host: linux
+            qt-arch: ${{ inputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }} 
             dump-symbols-arch: x86-64
           - platform: linux_arm64
             arch: aarch64
-            runs-on: ubuntu-22.04-arm
+            runs-on: ${{ inputs.use_qt69 == 'on' && 'ubuntu-24.04-arm' || 'ubuntu-22.04-arm' }}  
+            qt-host: linux_arm64
+            qt-arch: linux_gcc_arm64
             dump-symbols-arch: aarch64
     steps:
     - name: Cancel Previous Runs
@@ -165,10 +178,25 @@ jobs:
 
     - name: Register gcc problem matcher
       run: echo "::add-matcher::.github/problem_matchers/gcc.json"
-  
+
+    - name: Install Qt
+      # TODO: Change back to jurplel/install-qt-action@v4 when it supports arm64
+      uses: jdpurcell/install-qt-action@v5 
+      if: ${{ !(matrix.qt-host == 'linux_arm64' && inputs.use_qt69 != 'on') }}
+      with:
+        version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
+        host: ${{ matrix.qt-host }}
+        target: 'desktop'
+        arch: ${{ matrix.qt-arch }}
+        modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
+    - name: Install Qt 6.2.4 arm64
+      if: ${{ matrix.qt-host == 'linux_arm64' && inputs.use_qt69 != 'on' }}  
+      run: |
+        bash ./buildscripts/ci/linux/arm64/install_qt.sh     
     - name: Setup environment
       run: |
         bash ./buildscripts/ci/linux/setup.sh --arch ${{ matrix.arch }}
+
     - name: Generate _en.ts files
       env:
         LUPDATE_ARGS: ""

.github/workflows/build_linux_arm32.yml

@@ -16,6 +16,10 @@ on:
         description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
         default: ''
         required: false
+      use_qt69:
+        description: 'Use Qt 6.9'
+        default: 'off'
+        required: false   
   workflow_call:
     inputs:
       build_mode:
@@ -33,6 +37,11 @@ on:
         default: ''
         type: string
         required: false
+      use_qt69:
+        description: 'Use Qt 6.9'
+        default: 'off'
+        type: string
+        required: false  
 
 jobs:
   linux_arm32:
@@ -120,12 +129,6 @@ jobs:
         echo "DO_PUBLISH=$DO_PUBLISH" | tee -a $GITHUB_ENV
         echo "UPLOAD_ARTIFACT_NAME=$UPLOAD_ARTIFACT_NAME" | tee -a $GITHUB_ENV
 
-    # - name: Generate _en.ts files
-    #   env:
-    #     LUPDATE_ARGS: ""
-    #     POSTPROCESS_ARGS: ${{ env.DO_PLACEHOLDER_TRANSLATIONS == 'true' && '--generate-placeholder-translations' || '' }}
-    #   run: |
-    #     bash ./buildscripts/ci/translation/run_lupdate.sh
     - name: Update .ts files (tx pull)
       if: env.DO_UPDATE_TS == 'true'
       uses: transifex/cli-action@v2
@@ -135,7 +138,7 @@ jobs:
 
     - name: Register gcc problem matcher
       run: echo "::add-matcher::.github/problem_matchers/gcc.json"
-  
+
     - name: Setup, Generate _en.ts files, Build AppImage, Package, Checksum
       env: # For lupdate
         LUPDATE_ARGS: ""
@@ -144,8 +147,10 @@ jobs:
         C_URL=${SENTRY_URL}; if [ -z "$C_URL" ]; then C_URL="''"; fi
         sudo docker run --platform linux/arm -i -v "${PWD}:/MuseScore" -v /usr/bin/qemu-arm-static:/usr/bin/qemu-arm-static "arm32v7/ubuntu:jammy" /bin/bash -c "\
           cd /MuseScore && \
+          git config --global --add safe.directory /MuseScore && \
           bash /MuseScore/buildscripts/ci/linux/setup.sh --arch armv7l && \
-          bash /MuseScore/buildscripts/ci/translation/run_lupdate.sh && \
+          bash /MuseScore/buildscripts/ci/linux/arm32/install_qt.sh && \
+          bash /MuseScore/tools/translation/run_lupdate.sh && \
           bash /MuseScore/buildscripts/ci/linux/build.sh -n ${{ env.BUILD_NUMBER }} --crash_log_url $C_URL --arch armv7l && \
           bash /MuseScore/buildscripts/ci/linux/package.sh --arch armv7l && \
           bash /MuseScore/buildscripts/ci/tools/checksum.sh \

.github/workflows/build_macos.yml

@@ -16,6 +16,10 @@ on:
         description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
         default: ''
         required: false
+      use_qt69:
+        description: 'Use Qt 6.9'
+        default: 'off'
+        required: false    
   workflow_call:
     inputs:
       build_mode:
@@ -33,6 +37,11 @@ on:
         default: ''
         type: string
         required: false
+      use_qt69:
+        description: 'Use Qt 6.9'
+        default: 'off'
+        type: string
+        required: false   
 
 env:
   DEVELOPER_DIR: /Applications/Xcode_16.3.app/Contents/Developer
@@ -151,15 +160,24 @@ jobs:
         brew install ccache
         bash ./buildscripts/ci/tools/setup_ccache_config.sh
 
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
+        host: 'mac'
+        target: 'desktop'
+        arch: 'clang_64'
+        modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
     - name: Setup environment
       run: |
         bash ./buildscripts/ci/macos/setup.sh
+
     - name: Generate _en.ts files
       env:
         LUPDATE_ARGS: ""
         POSTPROCESS_ARGS: "--warn-only ${{ env.DO_PLACEHOLDER_TRANSLATIONS == 'true' && '--generate-placeholder-translations' || '' }}"
       run: |
-        bash ./buildscripts/ci/translation/run_lupdate.sh
+        bash ./tools/translations/run_lupdate.sh
     - name: Update .ts files (tx pull)
       if: env.DO_UPDATE_TS == 'true'
       uses: transifex/cli-action@v2

.github/workflows/build_nightly.yml

@@ -49,5 +49,6 @@ jobs:
                 build_mode: 'nightly',
                 publish: 'on',
                 sentry_project: 'sandbox'
+                use_qt69: 'off'
               }
             })