Deployment Updates

.github/workflows/android-linux.yml

@@ -12,11 +12,12 @@ on:
       - '.github/workflows/android-linux.yml'
       - 'deploy/android/**'
       - 'src/**'
+      - 'android/**'
       - 'CMakeLists.txt'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref }}
+#   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build:

.github/workflows/android-macos.yml

@@ -3,9 +3,9 @@ name: Android-MacOS
 on:
   workflow_dispatch:
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref }}
+#   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build:

.github/workflows/android-windows.yml

@@ -12,11 +12,12 @@ on:
       - '.github/workflows/android-windows.yml'
       - 'deploy/android/**'
       - 'src/**'
+      - 'android/**'
       - 'CMakeLists.txt'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref }}
+#   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build:

.github/workflows/custom.yml

@@ -15,9 +15,9 @@ on:
       - 'custom-example/**'
       - 'CMakeLists.txt'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref }}
+#   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build:

.github/workflows/docker-linux.yml

@@ -9,15 +9,15 @@ on:
       - 'v*'
   pull_request:
     paths:
-      - 'src/**'
+      - '.github/workflows/docker-linux.yml'
       - 'deploy/docker/**'
       - 'deploy/linux/**'
+      - 'src/**'
       - 'CMakeLists.txt'
 
-concurrency:
-  # cancel jobs on PRs only
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref }}
+#   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build:

.github/workflows/ios.yml

@@ -3,9 +3,9 @@ name: iOS
 on:
   workflow_dispatch:
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref }}
+#   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build:

.github/workflows/linux.yml

@@ -14,9 +14,9 @@ on:
       - 'src/**'
       - 'CMakeLists.txt'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref }}
+#   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build:

.github/workflows/macos.yml

@@ -14,9 +14,9 @@ on:
       - 'src/**'
       - 'CMakeLists.txt'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref }}
+#   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build:
@@ -89,6 +89,7 @@ jobs:
           cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
       - name: Import Code Signing Certificate
+        if: github.event_name != 'pull_request'
         uses: apple-actions/import-codesign-certs@v3
         with:
           p12-file-base64: ${{ secrets.MACOS_SIGNING_CERTS_P12 }}
@@ -101,6 +102,7 @@ jobs:
         run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja
               -DCMAKE_BUILD_TYPE=${{ matrix.BuildType }}
               -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
+              -DMACOS_SIGNING_IDENTITY=${{ secrets.MACOS_SIGNING_IDENTITY }}
               -DQGC_STABLE_BUILD=${{ github.ref_type == 'tag' || contains(github.ref, 'Stable') && 'ON' || 'OFF' }}
 
       - name: Build

.github/workflows/windows.yml

@@ -14,9 +14,9 @@ on:
       - 'src/**'
       - 'CMakeLists.txt'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref }}
+#   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build:

CMakeLists.txt

@@ -25,7 +25,9 @@ endif()
 
 # set(CMAKE_OSX_ARCHITECTURES "arm64")
 # set(CMAKE_OSX_SYSROOT "iphoneos")
-# set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0")
+if(APPLE AND NOT IOS)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0")
+endif()
 
 include(Git)
 
@@ -538,7 +540,10 @@ install(
 
 set(deploy_tool_options_arg "")
 if(MACOS)
-    # set(deploy_tool_options_arg -qmldir=${CMAKE_SOURCE_DIR}/src -verbose=2 -appstore-compliant) # -dmg -hardened-runtime -timestamp
+    if(MACOS_SIGNING_IDENTITY)
+        message(STATUS "Signing MacOS Bundle")
+        set(deploy_tool_options_arg -qmldir=${CMAKE_SOURCE_DIR} -verbose=2 -sign-for-notarization=${MACOS_SIGNING_IDENTITY}) # -dmg
+    endif()
 endif()
 
 qt_generate_deploy_qml_app_script(

src/CMakeLists.txt

@@ -89,7 +89,7 @@ target_link_libraries(QGC
 target_include_directories(QGC PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_precompile_headers(QGC
-    PUBLIC
+    PRIVATE
         <QtCore/QObject>
         <QtCore/QString>
 )