some clean up

mattermost · Feb 12, 2025 · 5ec744b · 5ec744b
1 parent c69adc5
commit 5ec744b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/e2e-ios-template.yml b/.github/workflows/e2e-ios-template.yml
@@ -124,7 +124,7 @@ jobs:
     name: ios-detox-e2e-${{ matrix.runId }}-${{ matrix.deviceName }}-${{ matrix.deviceOsVersion }}
     runs-on: macos-14
     continue-on-error: true
-    timeout-minutes: ${{ inputs.low_bandwidth_mode && 80 || 40 }}
+    timeout-minutes: ${{ inputs.low_bandwidth_mode && 140 || 70 }}
     env:
       IOS: true
     needs:

diff --git a/detox/.detoxrc.json b/detox/.detoxrc.json
@@ -30,14 +30,14 @@
     "ios.simulator": {
       "type": "ios.simulator",
       "device": {
-        "type": "iPhone 16 Pro",
-        "os": "iOS 18.1"
+        "type": "__DEVICE_NAME__",
+        "os": "__DEVICE_OS_VERSION__"
       }
     },
     "android.emulator": {
       "type": "android.emulator",
       "device": {
-        "avdName": "detox_pixel_4_xl_api_33"
+        "avdName": "detox_pixel_4_xl_api_34"
       }
     }
   },

diff --git a/detox/create_android_emulator.sh b/detox/create_android_emulator.sh
@@ -5,7 +5,7 @@ set -ex
 set -o pipefail
 
 SDK_VERSION=${1:-34}  # First argument is SDK version
-AVD_BASE_NAME=${2:-"detox_pixel_4_xl_api_33"}  # Second argument is AVD base name
+AVD_BASE_NAME=${2:-"detox_pixel_4_xl_api_34"}  # Second argument is AVD base name
 AVD_NAME="${AVD_BASE_NAME}_api_${SDK_VERSION}"
 TEST_FILES=${@:3} # Capture all remaining arguments as Detox test files
 

diff --git a/detox/save_report.js b/detox/save_report.js
@@ -100,9 +100,6 @@ const saveReport = async () => {
     const platform = process.env.IOS === 'true' ? 'ios' : 'android';
     const combinedFilePath = `${ARTIFACTS_DIR}/${platform}-combined.xml`;
 
-    console.log('Combined file path:', combinedFilePath);
-    console.log('Merfe file arg:', [`${ARTIFACTS_DIR}/${platform}-results*/${platform}-junit*.xml`]);
-
     await mergeFiles(path.join(__dirname, combinedFilePath), [`${ARTIFACTS_DIR}/${platform}-results*/${platform}-junit*.xml`]);
     console.log(`Merged, check ${combinedFilePath}`);