From bef0dc3f96d45ab969c6791f04b4ec2e043d2ce6 Mon Sep 17 00:00:00 2001
From: Conrad Kramer <conrad@conradkramer.com>
Date: Sat, 7 Sep 2024 17:08:02 -0700
Subject: [PATCH] Download provisioning profiles

---
 .github/actions/download-profiles/action.yml | 5 +++--
 .github/workflows/build-apple.yml            | 6 ++++++
 .github/workflows/build-rust.yml             | 2 +-
 .github/workflows/release-apple.yml          | 6 ++++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/actions/download-profiles/action.yml b/.github/actions/download-profiles/action.yml
index 98961aad..cb1bcefe 100644
--- a/.github/actions/download-profiles/action.yml
+++ b/.github/actions/download-profiles/action.yml
@@ -14,14 +14,15 @@ runs:
   steps:
   - shell: bash
     run: |
+      APP_STORE_KEY=$(echo "${{ inputs.app-store-key }}" | jq -sR .)
       cat << EOF > api-key.json
       {
         "key_id": "${{ inputs.app-store-key-id }}",
         "issuer_id": "${{ inputs.app-store-key-issuer-id }}",
-        "key": "${{ inputs.app-store-key }}"
+        "key": $APP_STORE_KEY
       }
       EOF
 
-      fastlane sigh download_all --api_key_path api-key.json --download_xcode_profiles
+      fastlane sigh download_all --opt_out_usage --api_key_path api-key.json --download_xcode_profiles
 
       rm -rf api-key.json
diff --git a/.github/workflows/build-apple.yml b/.github/workflows/build-apple.yml
index 84cc03a8..3dde1a16 100644
--- a/.github/workflows/build-apple.yml
+++ b/.github/workflows/build-apple.yml
@@ -45,6 +45,12 @@ jobs:
       with:
         ssh-key: ${{ secrets.DEPLOY_KEY }}
         submodules: recursive
+    - name: Download Provisioning Profiles
+      uses: ./.github/actions/download-profiles
+      with:
+        app-store-key: ${{ secrets.APPSTORE_KEY }}
+        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
+        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
     - name: Import Certificate
       uses: ./.github/actions/import-cert
       with:
diff --git a/.github/workflows/build-rust.yml b/.github/workflows/build-rust.yml
index 11ff60de..22bf83a8 100644
--- a/.github/workflows/build-rust.yml
+++ b/.github/workflows/build-rust.yml
@@ -42,7 +42,7 @@ jobs:
           - aarch64-pc-windows-msvc
     runs-on: ${{ matrix.os }}
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.0.app/Contents/Developer
       CARGO_INCREMENTAL: 0
       CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
       RUST_BACKTRACE: short
diff --git a/.github/workflows/release-apple.yml b/.github/workflows/release-apple.yml
index f1ee5dd2..fcdbee42 100644
--- a/.github/workflows/release-apple.yml
+++ b/.github/workflows/release-apple.yml
@@ -30,6 +30,12 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
+    - name: Download Provisioning Profiles
+      uses: ./.github/actions/download-profiles
+      with:
+        app-store-key: ${{ secrets.APPSTORE_KEY }}
+        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
+        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
     - name: Import Certificate
       uses: ./.github/actions/import-cert
       with: