Merge branch 'master'

.github/workflows/cmake_macos.yml

@@ -11,6 +11,7 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
+      - "!.github/workflows/**"
       - .github/workflows/cmake_macos.yml
       - vcpkg.json
       - "!**/Makefile*"
@@ -21,7 +22,7 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/**
+      - "!.github/workflows/**"
       - .github/workflows/cmake_macos.yml
       - vcpkg.json
       - "!**/Makefile*"
@@ -29,13 +30,11 @@ on:
 jobs:
 
   macos13-x86_64:
+
     name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64"
 
     runs-on: macos-13
 
-    env:
-      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
-
     strategy:
       fail-fast: true
       matrix:
@@ -83,9 +82,6 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v3
-
       - name: Configure CMake
         run: >-
           cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
@@ -99,20 +95,10 @@ jobs:
           -D LIBSERIALPORT_ROOT=$(brew --prefix libserialport)
 
       - name: Build
-        run: |
-          build-wrapper-macosx-x86 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build
-
-      - name: Run sonar-scanner
-        if: 0
-        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 }}"
+        run: cmake --build build
 
       - name: Generate package
-        run: |
-          cmake --install build
+        run: cmake --install build
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -121,13 +107,11 @@ jobs:
           path: build/artifacts/**
 
   macos14-arm64:
+
     name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, arm64"
 
     runs-on: macos-14
 
-#    env:
-#      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
-
     strategy:
       fail-fast: true
       matrix:
@@ -175,9 +159,6 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-#      - name: Install sonar-scanner and build-wrapper
-#        uses: SonarSource/sonarcloud-github-c-cpp@v3
-
       - name: Configure CMake
         run: >-
           cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
@@ -191,20 +172,10 @@ jobs:
           -D LIBSERIALPORT_ROOT=$(brew --prefix libserialport)
 
       - name: Build
-        run: |
-          cmake --build build
-
-#      - name: Run sonar-scanner
-#        if: 0
-#        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 }}"
+        run: cmake --build build
 
       - name: Generate package
-        run: |
-          cmake --install build
+        run: cmake --install build
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4