Mintenance (#759)

coronalabs · Jan 18, 2025 · ee8b5e1 · ee8b5e1
1 parent 9c7c33f
commit ee8b5e1
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
 
   native:
     needs: source-code
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - name: Get processed code
@@ -65,11 +65,11 @@ jobs:
           name: Native
           path: ./output
 
-  Xcode-template-matrix-14:
+  Xcode-template-matrix-15:
     strategy:
       matrix:
         runner:
-          - macos-14
+          - macos-15
         xcode:
           - Xcode_16.2
           - Xcode_16
@@ -156,7 +156,7 @@ jobs:
   collect-ios-templates:
     needs:
       - Xcode-template-matrix-13
-      - Xcode-template-matrix-14
+      - Xcode-template-matrix-15
     runs-on: ubuntu-20.04
     if: (! failure() && ! cancelled())
     steps:
@@ -460,12 +460,19 @@ jobs:
         env:
           CERT_PASSWORD: ${{ secrets.CertPassword }}
       - name: Notarize
+        id: notarize
         run: |
           [ -n "$APPLE_ISSUER" ] || exit 0
-          APPLE_KEY_FILE="$(mktemp)"
-          echo "$APPLE_KEY" > "$APPLE_KEY_FILE"
-          xcrun notarytool submit --key "$APPLE_KEY_FILE" --issuer "$APPLE_ISSUER" --key-id "$APPLE_KEY_ID" --wait ./output/*.dmg
-          xcrun stapler staple ./output/*.dmg
+          if ! (
+            set -ex
+            APPLE_KEY_FILE="$(mktemp)"
+            echo "$APPLE_KEY" > "$APPLE_KEY_FILE"
+            xcrun notarytool submit --key "$APPLE_KEY_FILE" --issuer "$APPLE_ISSUER" --key-id "$APPLE_KEY_ID" --wait ./output/*.dmg
+            xcrun stapler staple ./output/*.dmg
+          )
+          then
+            echo "NOTARIZATION_FAILED=true" >> "$GITHUB_OUTPUT"
+          fi
         shell: bash
         env: # get this at https://appstoreconnect.apple.com/access/api
           APPLE_KEY: ${{ secrets.AppleKey }} ## full contents of the file
@@ -476,6 +483,11 @@ jobs:
         with:
           name: Simulator-macOS
           path: ./output
+      - name: Check if notarization failed
+        if: ${{ steps.notarize.outputs.NOTARIZATION_FAILED == 'true' }}
+        run: |
+          echo "Notarization failed"
+          exit 1
 
 
   check-notarization: