refactor again

.github/workflows/macstadium-builds.yml

@@ -1,6 +1,10 @@
 name: iOS builds
-
-on: [pull_request, workflow_dispatch]
+on:
+    workflow_run:
+        workflows: ["iOS e2e tests"]
+        types:
+        - completed
+    workflow_dispatch:
 
 jobs:
   # Job to install dependencies
@@ -45,37 +49,33 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - name: Install dependencies
-        run: |
-          yarn install && yarn setup
-
-      - name: Upload Yarn cache
-        uses: actions/upload-artifact@v3
-        with:
-          name: yarn-cache
-          path: |
-            .yarn/cache
-            .yarn/install-state.gz
-
       - name: Download Yarn cache
         uses: actions/download-artifact@v3
         with:
             name: yarn-cache
             path: .yarn
 
+      - name: Install dependencies
+        run: |
+          yarn install && yarn setup
+
       - name: Version debug
         run: |
           npx react-native info
 
       - name: Install pods
         run: yarn install-bundle && yarn install-pods
-
-      # TOPHAT SIM   
-      - name: Build the app in release mode for simulator
-        run: |
-          sed -i'' -e "s/IS_TESTING=true/IS_TESTING=false/" .env && rm -f .env-e 
-          xcodebuild -workspace ios/Rainbow.xcworkspace -scheme Rainbow -configuration Release -sdk iphonesimulator -derivedDataPath ios/build
+        # TEMP disabled because it's already working
+        # TOPHAT SIM   
+        #   - name: Build the app in release mode for simulator
+        #     run: |
+        #       sed -i'' -e "s/IS_TESTING=true/IS_TESTING=false/" .env && rm -f .env-e 
+        #       xcodebuild -workspace ios/Rainbow.xcworkspace -scheme Rainbow -configuration Release -sdk iphonesimulator -derivedDataPath ios/build
       - name: Build the app in release mode for iOS devices
+        env: 
+          FASTLANE_USER: ${{ secrets.FASTLANE_USER }}
+          FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }}
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
         run: |
             cd ios && bundle exec fastlane ios build_device
       - name: Upload builds to AWS S3

ios/fastlane/Fastfile

@@ -23,10 +23,6 @@ platform :ios do
       duration: 1200, # optional
       in_house: false, # optional but may be required if using match/sigh
     )
-
-    upload_symbols_to_crashlytics(
-      dsym_path: './Rainbow.app.dSYM.zip'
-    )
   end
 
   desc "Submit a new Beta build to Apple TestFlight"
@@ -92,21 +88,32 @@ platform :ios do
     )
 
     match(
-      username: ENV["FASTLANE_USER"],
       force: true,
       type: "adhoc",
       app_identifier: ["me.rainbow", "me.rainbow.PriceWidget", "me.rainbow.SelectTokenIntent", "me.rainbow.ImageNotification", "me.rainbow.OpenInRainbow", "me.rainbow.ShareWithRainbow"],
       git_url: "[email protected]:rainbow-me/rainbow-code-signing.git",
     )
 
+    xcversion(version: "15.3")
+
     gym(
       workspace: "Rainbow.xcworkspace",
       scheme: "Rainbow",
       include_symbols: false,
       export_method: "ad-hoc",
       output_directory: "build",
       output_name: "Rainbow.ipa",
-      archive_path: "build/Rainbow.xcarchive"
+      archive_path: "build/Rainbow.xcarchive",
+      export_options: {
+        provisioningProfiles: {
+          "me.rainbow" => "match AdHoc me.rainbow",
+          "me.rainbow.PriceWidget" => "match AdHoc me.rainbow.PriceWidget",
+          "me.rainbow.SelectTokenIntent" => "match AdHoc me.rainbow.SelectTokenIntent",
+          "me.rainbow.ImageNotification" => "match AdHoc me.rainbow.ImageNotification",
+          "me.rainbow.OpenInRainbow" => "match AdHoc me.rainbow.OpenInRainbow",
+          "me.rainbow.ShareWithRainbow" => "match AdHoc me.rainbow.ShareWithRainbow",
+        },
+      }
     )
 
   end