Merge branch 'main' into feat-header-update

MetaMask · Oct 17, 2024 · 65df76f · 65df76f
2 parents fc63b0a + 0482c6e
commit 65df76f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bitrise.yml b/bitrise.yml
@@ -811,7 +811,7 @@ workflows:
           inputs:
             - content: |-
                 #!/usr/bin/env bash
-                yarn test:api-specs
+                yarn test:api-specs --retries 1
       - script@1:
           is_always_run: true
           is_skippable: false
@@ -1263,6 +1263,8 @@ workflows:
           inputs:
             - ipa_path: $BITRISE_APP_STORE_IPA_PATH
   build_ios_release:
+    envs:
+       - NO_FLIPPER: '1'
     before_run:
       - code_setup
     after_run:
@@ -1302,6 +1304,8 @@ workflows:
             - deploy_path: sourcemaps/ios/index.js.map
           title: Deploy Source Map
   build_ios_qa:
+    envs:
+       - NO_FLIPPER: '1'
     before_run:
       - code_setup
     after_run:

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -626,4 +626,4 @@ else
 	else
 		envFileMissing $ANDROID_ENV_FILE
 	fi
-fi
+fi