Staging - 7.6.1

.github/workflows/uploadApp.yml

@@ -28,6 +28,8 @@ jobs:
     steps:
       - name: Check out repository
         uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
+        with:
+          submodules: true
 
       - name: Setup environment
         uses: ./.github/actions/env-setup
@@ -39,6 +41,19 @@ jobs:
       - name: Install dependencies
         run: |
           npm install
+      # before building iOS app, please set the main server, the crash server, and the app token secret
+      # the plist to be modified is located at ./Test Harness/NRTestApp/NRAPI-Info.plist
+      # the secret mapping is as follows secrets.NRTESTAPP_CRASH_COLLECTOR_ADDRESS , secrets.NRTESTAPP_MAIN_COLLECTOR_ADDRESS, secrets.NRTESTAPP_APP_TOKEN
+      - name: Set plist secrets
+        env:
+          NRTESTAPP_CRASH_COLLECTOR_ADDRESS: ${{ secrets.NRTESTAPP_CRASH_COLLECTOR_ADDRESS }}
+          NRTESTAPP_MAIN_COLLECTOR_ADDRESS: ${{ secrets.NRTESTAPP_MAIN_COLLECTOR_ADDRESS }}
+          NRTESTAPP_APP_TOKEN: ${{ secrets.NRTESTAPP_APP_TOKEN }}
+        run: |
+          PLIST_PATH="./Test Harness/NRTestApp/NRAPI-Info.plist"
+          /usr/libexec/PlistBuddy -c "Set :crashCollectorAddress ${NRTESTAPP_CRASH_COLLECTOR_ADDRESS}" "$PLIST_PATH"
+          /usr/libexec/PlistBuddy -c "Set :collectorAddress ${NRTESTAPP_MAIN_COLLECTOR_ADDRESS}" "$PLIST_PATH"
+          /usr/libexec/PlistBuddy -c "Set :NRAPIKey ${NRTESTAPP_APP_TOKEN}" "$PLIST_PATH"
 
       - name: Clean iOS app
         run: |
@@ -73,23 +88,31 @@ jobs:
     needs: [build-ios]
     runs-on: ubuntu-latest
     env:
-      LT_USERNAME: ${{ secrets.APP_EXP_LAMBDA_USERNAME }}
-      LT_ACCESSKEY: ${{ secrets.APP_EXP_LAMBDA_ACCESS_KEY }}
+      LT_USERNAME: ${{ secrets.LAMBDA_USERNAME }}
+      LT_ACCESSKEY: ${{ secrets.LAMBDA_ACCESS_KEY }}
     steps:
       - uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 # pin@v4
 
       - name: Setup environment
         uses: ./.github/actions/env-setup
 
       - name: Download iOS artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: nrtestapp-ios
           path: ${{ github.workspace }}/builds
 
       - name: Run upload script
         run: node LambdaTest/uploadAppToLambdaTest.mjs
 
+      - name: Upload custom_id artifact
+        if: ${{ success() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: lambdatest-app-id
+          path: LambdaTest/last-app-id
+          retention-days: 1
+
       - name: Log success
         if: ${{ success() }}
         run: echo "[ RUNNER ] - successfully uploaded apps to LambdaTest"

.github/workflows/wdio.yml

@@ -10,6 +10,12 @@ on:
   # enables option for workflow to be manually executed in Github UI
   workflow_dispatch:
 
+  # Automatically trigger after uploadApp workflow completes successfully
+  workflow_run:
+    workflows: ["Upload iOS NRTestApp to LambdaTest"]
+    types:
+      - completed
+
   # enables scheduled execution every 30 minutes
   # schedule:
   #   - cron: "*/30 * * * *"
@@ -18,14 +24,66 @@ jobs:
   ios-data:
     name: Generate iOS data
     runs-on: ubuntu-latest
+    # Only run if manually triggered or if uploadApp workflow succeeded
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
     env:
-      LT_USERNAME: ${{ secrets.APP_EXP_LAMBDA_USERNAME }}
-      LT_ACCESSKEY: ${{ secrets.APP_EXP_LAMBDA_ACCESS_KEY }}
+      LT_USERNAME: ${{ secrets.LAMBDA_USERNAME }}
+      LT_ACCESSKEY: ${{ secrets.LAMBDA_ACCESS_KEY }}
     steps:
       - uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 # pin@v4
       - name: Setup environment
         uses: ./.github/actions/env-setup
 
+      - name: Download LambdaTest app ID artifact (from workflow_run)
+        if: github.event_name == 'workflow_run'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: context.payload.workflow_run.id,
+            });
+            const matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "lambdatest-app-id"
+            })[0];
+            if (matchArtifact) {
+              const download = await github.rest.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: matchArtifact.id,
+                archive_format: 'zip',
+              });
+              const fs = require('fs');
+              fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/app-id.zip`, Buffer.from(download.data));
+            }
+
+      - name: Extract app ID (from workflow_run)
+        if: github.event_name == 'workflow_run'
+        run: |
+          if [ -f app-id.zip ]; then
+            unzip -q app-id.zip -d LambdaTest/
+            echo "Extracted app ID from workflow_run artifact"
+          fi
+        continue-on-error: true
+
+      - name: Download LambdaTest app ID artifact (from manual run)
+        if: github.event_name == 'workflow_dispatch'
+        uses: actions/download-artifact@v6
+        with:
+          name: lambdatest-app-id
+          path: ${{ github.workspace }}/LambdaTest
+        continue-on-error: true
+
+      - name: Set LT_APP_ID environment variable
+        run: |
+          if [ -f LambdaTest/last-app-id ]; then
+            echo "LT_APP_ID=$(tr -d '\n' < LambdaTest/last-app-id)" >> $GITHUB_ENV
+            echo "Using app ID: $(tr -d '\n' < LambdaTest/last-app-id)"
+          else
+            echo "No app ID artifact found, tests will use default app ID from config"
+          fi
+
       - name: Execute iOS tests
         run: for i in {1..1}; do echo "test run $i"; npm run test:wdio-ios; done
 

.gitignore

@@ -91,3 +91,5 @@ iOSInjectionProject/
 .build
 Test Harness/NRTestApp/upload_dsym_results.log
 node_modules
+derived_path
+builds/nrtestapp-ios.zip