Merge branch 'staged' into dev

.github/workflows/PR-check-cmake.yml

@@ -99,16 +99,7 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
           submodules: true
-      - name: Setup vcpkg github caches variables
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
       - name: Run build
-        id: build
-        env:
-          VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
         run: |
           # Launch-VsDevShell also provides Ninja
           & 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1' `
@@ -118,8 +109,5 @@ jobs:
           cmake -S . -B "./build_dir" `
             -G Ninja `
             -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" `
-            -DWITH_FFMPEG_PLAYER=OFF `
-            -DUSE_VCPKG=ON `
-            -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" `
-            -DWITH_VCPKG_BREAKPAD=ON
+            -DWITH_FFMPEG_PLAYER=OFF
           cmake --build "./build_dir"

.github/workflows/Sonar Cloud.yml

@@ -6,62 +6,47 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - dev
       - staged
 
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
   build:
     name: Build and analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
     steps:            
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: 6.5.1
-          arch: gcc_64
-
-          #serialport linuxdeploy need serialport to work.
-          modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech qtserialport
-
       - name: ubuntu install thirdparty dependencies
         run: |
-          sudo apt-get install git pkg-config build-essential 
-          sudo apt-get install libvorbis-dev zlib1g-dev libhunspell-dev x11proto-record-dev 
-          sudo apt-get install libxtst-dev liblzo2-dev libbz2-dev 
-          sudo apt-get install libavutil-dev libavformat-dev libeb16-dev
-          sudo apt-get install doxygen libzstd-dev libxkbcommon-dev libgstreamer-plugins-base1.0-0 libgstreamer-gl1.0-0
-          sudo ln -sf /usr/bin/x86_64-linux-gnu-ld.gold /usr/bin/ld
-          sudo apt install libxapian-dev
-          #build opencc
-          git clone https://github.com/BYVoid/OpenCC
-          cd OpenCC/
-          make PREFIX=/usr -j$(nproc)
-          sudo make install
-          cd ..
-          sudo apt-get install libzim-dev
-          
-          sudo apt install openjdk-17-jdk openjdk-17-jre
-          java -version
+          sudo apt-get install build-essential ninja-build \
+          libvorbis-dev zlib1g-dev libhunspell-dev x11proto-record-dev \
+          libxtst-dev liblzo2-dev libbz2-dev \
+          libavutil-dev libavformat-dev libeb16-dev \
+          libzstd-dev libxkbcommon-dev \
+          libxapian-dev libzim-dev libopencc-dev \
+          qt6-5compat-dev \
+          qt6-base-dev \
+          qt6-multimedia-dev \
+          qt6-speech-dev \
+          qt6-svg-dev \
+          qt6-tools-dev \
+          qt6-tools-dev-tools \
+          qt6-webchannel-dev \
+          qt6-webengine-dev
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-          submodules: true
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18          
+          submodules: true    
       - name: Install sonar-scanner and build-wrapper
         uses: SonarSource/sonarcloud-github-c-cpp@v2
       - name: Run build-wrapper
         run: |
-          qmake CONFIG+=release CONFIG+=zim_support   CONFIG+=chinese_conversion_support
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make  -j8 
+          mkdir build_dir
+          cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -S . -B ./build_dir -G Ninja
       - name: Run sonar-scanner
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+          sonar-scanner --define sonar.cfamily.compile-commands=./build_dir/compile_commands.json