Merge pull request #336 from smolcars/fix-ios-build-artifacts

Add iOS xcarchive to GitHub Action release

Author: hsjoberg

.github/workflows/ios-device-build.yml

@@ -9,12 +9,6 @@ env:
 
 on:
   workflow_call:
-    inputs:
-      variant:
-        description: "The iOS app variant to build"
-        required: false
-        default: "signet"
-        type: string
     outputs:
       artifact_name:
         description: "The name of the uploaded artifact"
@@ -37,61 +31,28 @@ jobs:
       - name: 📦 Install dependencies
         run: nix develop .# --command bash -c "bun install --frozen-lockfile"
 
-      - name: 🧭 Resolve build variant
-        id: variant
-        shell: bash
-        env:
-          BUILD_VARIANT: ${{ inputs.variant }}
-        run: |
-          set -euo pipefail
-
-          case "$BUILD_VARIANT" in
-            mainnet)
-              echo "app_name=Noah.app" >> "$GITHUB_OUTPUT"
-              echo "artifact_name=noah-ios-mainnet" >> "$GITHUB_OUTPUT"
-              echo "build_script=build:ios:mainnet:device" >> "$GITHUB_OUTPUT"
-              echo "ipa_filename=noah-mainnet.ipa" >> "$GITHUB_OUTPUT"
-              ;;
-            signet)
-              echo "app_name=Noah-Signet.app" >> "$GITHUB_OUTPUT"
-              echo "artifact_name=noah-ios-signet" >> "$GITHUB_OUTPUT"
-              echo "build_script=build:ios:signet:device" >> "$GITHUB_OUTPUT"
-              echo "ipa_filename=noah-signet.ipa" >> "$GITHUB_OUTPUT"
-              ;;
-            *)
-              echo "Unsupported iOS variant '$BUILD_VARIANT'. Use 'mainnet' or 'signet'."
-              exit 1
-              ;;
-          esac
-
-      - name: 🔧 Create sentry.properties
-        if: ${{ inputs.variant == 'mainnet' }}
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-        run: ./scripts/create_sentry_properties.sh
-
       - name: 🛠️ Build for device
-        run: nix develop .# --command bash -c "bun client ios:prebuild && bun client ${{ steps.variant.outputs.build_script }}"
+        run: nix develop .# --command bash -c "bun client ios:prebuild && bun client build:ios:signet:device"
 
       - name: 📦 Create IPA
         run: |
           mkdir -p client/ios/build/ipa
           mkdir -p Payload
-          cp -R "client/ios/build/Build/Products/Release-iphoneos/${{ steps.variant.outputs.app_name }}" Payload/
-          zip -r "client/ios/build/ipa/${{ steps.variant.outputs.ipa_filename }}" Payload
+          cp -R client/ios/build/Build/Products/Release-iphoneos/Noah-Signet.app Payload/
+          zip -r client/ios/build/ipa/noah-signet.ipa Payload
           rm -rf Payload
 
       - name: 📁 Set outputs
         id: set_outputs
         run: |
-          echo "artifact_name=${{ steps.variant.outputs.artifact_name }}" >> $GITHUB_OUTPUT
-          echo "ipa_filename=${{ steps.variant.outputs.ipa_filename }}" >> $GITHUB_OUTPUT
+          echo "artifact_name=noah-ios-signet" >> $GITHUB_OUTPUT
+          echo "ipa_filename=noah-signet.ipa" >> $GITHUB_OUTPUT
 
       - name: 📤 Upload IPA artifact
         uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.set_outputs.outputs.artifact_name }}
-          path: client/ios/build/ipa/${{ steps.set_outputs.outputs.ipa_filename }}
+          path: client/ios/build/ipa/noah-signet.ipa
           if-no-files-found: error
           overwrite: true
 
@@ -100,5 +61,3 @@ jobs:
         run: |
           rm -rf client/ios/build
           rm -rf Payload
-          rm -f client/android/sentry.properties
-          rm -f client/ios/sentry.properties

.github/workflows/ios-telegram.yml

@@ -16,8 +16,6 @@ jobs:
   build:
     name: Build iOS Device App
     uses: ./.github/workflows/ios-device-build.yml
-    with:
-      variant: signet
     secrets: inherit
 
   upload_and_notify:

.github/workflows/release.yml

@@ -20,24 +20,54 @@ jobs:
       git_ref: ${{ github.ref }}
     secrets: inherit
 
-  ios-signet-build:
-    name: Build iOS Signet IPA
-    uses: ./.github/workflows/ios-device-build.yml
-    with:
-      variant: signet
-    secrets: inherit
+  ios-mainnet-archive:
+    name: Build iOS Mainnet Archive
+    runs-on: macOS
+    env:
+      # Self-hosted runners persist /nix/store; avoid stale Magic Nix Cache hooks/proxies.
+      NIX_CONFIG: |
+        post-build-hook =
+        extra-substituters =
+        substituters = https://cache.nixos.org/
+    steps:
+      - name: 🏗 Checkout repository
+        uses: actions/checkout@v6
 
-  ios-mainnet-build:
-    name: Build iOS Mainnet IPA
-    uses: ./.github/workflows/ios-device-build.yml
-    with:
-      variant: mainnet
-    secrets: inherit
+      - name: 📦 Install dependencies
+        run: nix develop .# --command bash -c "bun install --frozen-lockfile"
+
+      - name: 🔧 Create sentry.properties
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        run: ./scripts/create_sentry_properties.sh
+
+      - name: 🛠️ Build development-signed archive
+        run: nix develop .# --command bash -c "bun client ios:prebuild && bun client build:ios:mainnet:archive"
+
+      - name: 📦 Package archive
+        run: |
+          tar -czf client/ios/build/noah-mainnet.xcarchive.tar.gz \
+            -C client/ios/build Noah-mainnet.xcarchive
+
+      - name: 📤 Upload archive artifact
+        uses: actions/upload-artifact@v7
+        with:
+          path: client/ios/build/noah-mainnet.xcarchive.tar.gz
+          archive: false
+          if-no-files-found: error
+          retention-days: 90
+
+      - name: 🧹 Clean up build artifacts
+        if: always()
+        run: |
+          rm -rf client/ios/build
+          rm -f client/android/sentry.properties
+          rm -f client/ios/sentry.properties
 
   release:
     name: Create GitHub Release
     runs-on: ubuntu-latest
-    needs: [signet-build, mainnet-build, ios-signet-build, ios-mainnet-build]
+    needs: [signet-build, mainnet-build, ios-mainnet-archive]
     permissions:
       contents: write
     steps:
@@ -53,29 +83,13 @@ jobs:
           name: ${{ needs.mainnet-build.outputs.apk_artifact_name }}
           path: release-assets/mainnet-apk
 
-      - name: 📥 Download signet IPA artifact
-        uses: actions/download-artifact@v8
-        with:
-          name: ${{ needs.ios-signet-build.outputs.artifact_name }}
-          path: release-assets/signet-ipa
-
-      - name: 📥 Download mainnet IPA artifact
-        uses: actions/download-artifact@v8
-        with:
-          name: ${{ needs.ios-mainnet-build.outputs.artifact_name }}
-          path: release-assets/mainnet-ipa
-
       - name: 📝 Prepare release assets
         run: |
           set -euo pipefail
           mv "release-assets/signet/${{ needs.signet-build.outputs.apk_filename }}" \
             release-assets/noah-signet.apk
           mv "release-assets/mainnet-apk/${{ needs.mainnet-build.outputs.apk_filename }}" \
             release-assets/noah-mainnet.apk
-          mv "release-assets/signet-ipa/${{ needs.ios-signet-build.outputs.ipa_filename }}" \
-            release-assets/noah-ios-signet.ipa
-          mv "release-assets/mainnet-ipa/${{ needs.ios-mainnet-build.outputs.ipa_filename }}" \
-            release-assets/noah-ios-mainnet.ipa
 
       - name: 🚀 Create GitHub Release
         env:
@@ -87,8 +101,6 @@ jobs:
           gh release create "${GITHUB_REF_NAME}" \
             release-assets/noah-signet.apk \
             release-assets/noah-mainnet.apk \
-            release-assets/noah-ios-signet.ipa \
-            release-assets/noah-ios-mainnet.ipa \
             --repo "${{ github.repository }}" \
             --title "Noah ${release_version}" \
             --generate-notes

client/package.json

@@ -41,6 +41,7 @@
     "build:ios:ci": "xcrun xcodebuild -scheme 'Noah-Regtest' -workspace 'ios/noah.xcworkspace' -configuration Release -sdk 'iphonesimulator' -destination 'generic/platform=iOS Simulator' -derivedDataPath ios/build -quiet ARCHS=arm64",
     "build:ios:mainnet:device": "xcrun xcodebuild -scheme 'Noah' -workspace 'ios/noah.xcworkspace' -configuration Release -sdk iphoneos -derivedDataPath ios/build -allowProvisioningUpdates build -quiet ARCHS=arm64",
     "build:ios:signet:device": "xcrun xcodebuild -scheme 'Noah-Signet' -workspace 'ios/noah.xcworkspace' -configuration Release -sdk iphoneos -derivedDataPath ios/build -allowProvisioningUpdates build -quiet ARCHS=arm64",
+    "build:ios:mainnet:archive": "xcrun xcodebuild -scheme 'Noah' -workspace 'ios/noah.xcworkspace' -configuration Release -destination 'generic/platform=iOS' -derivedDataPath ios/build/DerivedData -archivePath ios/build/Noah-mainnet.xcarchive -allowProvisioningUpdates archive -quiet CODE_SIGN_STYLE=Automatic",
     "nitrogen": "bun --cwd nitromodules/noah-tools nitrogen",
     "format": "prettier --write .",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",