From fa1ef6fcda7acf4f9a0cf66d811baf1e626ac2a4 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 in release pipeline

---
 .github/actions/download-profiles/action.yml |  7 +++++--
 .github/actions/export/action.yml            | 10 +++-------
 .github/workflows/build-rust.yml             |  2 +-
 .github/workflows/release-apple.yml          | 21 ++++++++++++--------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/.github/actions/download-profiles/action.yml b/.github/actions/download-profiles/action.yml
index 98961aa..32b615c 100644
--- a/.github/actions/download-profiles/action.yml
+++ b/.github/actions/download-profiles/action.yml
@@ -13,15 +13,18 @@ runs:
   using: composite
   steps:
   - shell: bash
+    env:
+      FASTLANE_OPT_OUT_USAGE: 'YES'
     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 --api_key_path api-key.json
 
       rm -rf api-key.json
diff --git a/.github/actions/export/action.yml b/.github/actions/export/action.yml
index 8f891be..75b748f 100644
--- a/.github/actions/export/action.yml
+++ b/.github/actions/export/action.yml
@@ -12,11 +12,8 @@ inputs:
   archive-path:
     description: Xcode archive path
     required: true
-  destination:
-    description: The Xcode export destination. This can either be "export" or "upload"
-    required: true
-  method:
-    description: The Xcode export method. This can be one of app-store, validation, ad-hoc, package, enterprise, development, developer-id, or mac-application.
+  export-options:
+    description: The export options in JSON format
     required: true
   export-path:
     description: The path to export the archive to
@@ -29,8 +26,7 @@ runs:
     run: |
       echo "${{ inputs.app-store-key }}" > AuthKey_${{ inputs.app-store-key-id }}.p8
 
-      echo '{"destination":"${{ inputs.destination }}","method":"${{ inputs.method }}"}' \
-        | plutil -convert xml1 -o ExportOptions.plist -
+      echo '${{ inputs.export-options }}' | plutil -convert xml1 -o ExportOptions.plist -
 
       xcodebuild \
         -exportArchive \
diff --git a/.github/workflows/build-rust.yml b/.github/workflows/build-rust.yml
index 11ff60d..22bf83a 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 f1ee5dd..bb9c15a 100644
--- a/.github/workflows/release-apple.yml
+++ b/.github/workflows/release-apple.yml
@@ -13,13 +13,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - 
-          destination: generic/platform=iOS
-          platform: iOS
+        - platform: iOS
           rust-targets:
           - aarch64-apple-ios
-        - destination: generic/platform=macOS
-          platform: macOS
+        - platform: macOS
           rust-targets:
           - x86_64-apple-darwin
           - aarch64-apple-darwin
@@ -35,6 +32,12 @@ jobs:
       with:
         certificate: ${{ secrets.DEVELOPER_CERT }}
         password: ${{ secrets.DEVELOPER_CERT_PASSWORD }}
+    - 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: Install Rust
       uses: dtolnay/rust-toolchain@stable
       with:
@@ -47,7 +50,7 @@ jobs:
       uses: ./.github/actions/archive
       with:
         scheme: App
-        destination: ${{ matrix.destination }}
+        destination: generic/platform=${{ matrix.platform }}
         app-store-key: ${{ secrets.APPSTORE_KEY }}
         app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
         app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
@@ -61,6 +64,8 @@ jobs:
         app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
         app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
         archive-path: Burrow.xcarchive
+        export-options: |
+          {"teamID":"P6PV2R9443","destination":"export","method":"developer-id","provisioningProfiles":{"com.hackclub.burrow":"Burrow Developer ID","com.hackclub.burrow.network":"Burrow Network Developer ID"},"signingCertificate":"Developer ID Application","signingStyle":"manual"}
         export-path: Release
     - name: Notarize
       if: ${{ matrix.platform == 'macOS' }}
@@ -96,10 +101,10 @@ jobs:
       if: ${{ matrix.platform == 'iOS' }}
       uses: ./.github/actions/export
       with:
-        method: app-store
-        destination: upload
         app-store-key: ${{ secrets.APPSTORE_KEY }}
         app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
         app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
         archive-path: Burrow.xcarchive
+        export-options: |
+          {"method": "app-store", "destination": "upload"}
         export-path: Release