Deployment Updates

mavlink · Jan 18, 2025 · 9ff1886 · 9ff1886
1 parent 2a43b69
commit 9ff1886
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 31 deletions.
diff --git a/.github/workflows/android-linux.yml b/.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:

diff --git a/.github/workflows/android-macos.yml b/.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:

diff --git a/.github/workflows/android-windows.yml b/.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:

diff --git a/.github/workflows/custom.yml b/.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:

diff --git a/.github/workflows/docker-linux.yml b/.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:

diff --git a/.github/workflows/ios.yml b/.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:

diff --git a/.github/workflows/linux.yml b/.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:

diff --git a/.github/workflows/macos.yml b/.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,11 +89,16 @@ 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 }}
           p12-password: ${{ secrets.MACOS_SIGNING_CERTS_PASS }}
 
+      - run: |
+          echo "APPLE_APPID_TEAM_ID=Mac Developer ID Application: Donald Gagne" >> "$GITHUB_ENV"
+        shell: bash
+
       - run: mkdir ${{ runner.temp }}/shadow_build_dir
 
       - name: Configure

diff --git a/.github/workflows/windows.yml b/.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:

diff --git a/CMakeLists.txt b/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(ENV{APPLE_APPID_TEAM_ID})
+        message(STATUS "Signing MacOS Bundle")
+        set(deploy_tool_options_arg -qmldir=${CMAKE_SOURCE_DIR} -verbose=1 -sign-for-notarization="$ENV{APPLE_APPID_TEAM_ID}") # -dmg
+    endif()
 endif()
 
 qt_generate_deploy_qml_app_script(

diff --git a/deploy/macos/MacCertificates.p12.enc b/deploy/macos/MacCertificates.p12.enc