Skip to content

Commit 9a97c00

Browse files
authored
Merge branch 'main' into predict/crypto-data-plumbing
2 parents 7892a2b + ea0f772 commit 9a97c00

410 files changed

Lines changed: 17732 additions & 12226 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ai-pr-analyzer/config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ critical:
2121
- android/settings.gradle
2222
- android/gradle.properties
2323
- android/app/build.gradle
24-
- bitrise.yml
2524
- builds.yml
2625
- .github/workflows/ci.yml
2726
- .github/workflows/build.yml

.detoxrc.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,6 @@ module.exports = {
100100
forceAdbInstall: true,
101101
gpuMode: 'swiftshader_indirect',
102102
},
103-
'android.bitrise.emulator': {
104-
type: 'android.emulator',
105-
device: {
106-
avdName: 'emulator',
107-
},
108-
// optimized for Bitrise CI runners
109-
bootArgs: '-verbose -show-kernel -no-audio -netdelay none -no-snapshot -wipe-data -gpu auto -no-window -no-boot-anim -read-only',
110-
forceAdbInstall: true,
111-
}
112103
},
113104
apps: {
114105
'ios.debug': {

.github/CODEOWNERS

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ app/components/hooks/useMetrics/ @MetaMask/mobile-pla
2626
app/selectors/featureFlagController/* @MetaMask/mobile-platform
2727
app/selectors/featureFlagController/minimumAppVersion/ @MetaMask/mobile-platform
2828
app/store/migrations/ @MetaMask/mobile-platform
29-
bitrise.yml @MetaMask/mobile-platform
3029
ios/Podfile.lock @MetaMask/mobile-platform
3130
app/components/Views/BrowserTab/BrowserTab.tsx @MetaMask/mobile-platform
3231
app/components/Nav/NavigationProvider @MetaMask/mobile-platform
@@ -146,12 +145,16 @@ app/core/Engine/controllers/bridge-controller @MetaMask/swaps-enginee
146145
app/core/Engine/controllers/bridge-status-controller @MetaMask/swaps-engineers
147146

148147
# Notifications Team
149-
app/components/Views/Notifications @MetaMask/notifications
150-
app/components/Views/Settings/NotificationsSettings @MetaMask/notifications
151-
**/Notifications/** @MetaMask/notifications
152-
**/Notification/** @MetaMask/notifications
153-
**/notifications/** @MetaMask/notifications
154-
**/notification/** @MetaMask/notifications
148+
**/*Braze*/ @MetaMask/engagement
149+
**/*Braze* @MetaMask/engagement
150+
**/*braze*/ @MetaMask/engagement
151+
**/*braze* @MetaMask/engagement
152+
app/components/Views/Notifications @MetaMask/engagement
153+
app/components/Views/Settings/NotificationsSettings @MetaMask/engagement
154+
**/Notifications/** @MetaMask/engagement
155+
**/Notification/** @MetaMask/engagement
156+
**/notifications/** @MetaMask/engagement
157+
**/notification/** @MetaMask/engagement
155158

156159
# LavaMoat Team
157160
ses.cjs @MetaMask/supply-chain

.github/CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,8 @@ When you're done with your project / bugfix / feature and ready to submit a PR,
2323
- [ ] **Get the PR reviewed by code owners**: At least two code owner approvals are mandatory before merging any PR.
2424
- [ ] **Ensure the PR is correctly labeled.**: More detail about labels definitions can be found [here](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md).
2525

26+
### Shadow CI jobs
27+
28+
CI jobs prefixed with `[shadow]` (e.g., from `ci-namespace-shadow.yml`) are **advisory only** and never gate merge. They run the same test suite on Namespace runners for performance benchmarking. If a shadow job fails, it does not indicate a problem with your PR -- it reflects the state of the Namespace runner migration trial.
29+
2630
And that's it! Thanks for helping out.

.github/actions/smart-e2e-selection/action.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ inputs:
2727
required: false
2828
default: 'false'
2929
base-ref:
30-
description: 'PR base branch ref passed to the AI analysis script for diff comparison. When release/*, AI selection is skipped and the full E2E suite is selected.'
30+
description: 'PR base branch ref passed to the AI analysis script for diff comparison. When release/* or stable, AI selection is skipped and the full E2E suite is selected.'
3131
required: false
3232
default: ''
3333
outputs:
@@ -57,15 +57,15 @@ runs:
5757
echo "⏭️ SKIP=true due to 'skip-smart-e2e-selection' label on PR"
5858
fi
5959
60-
- name: Check release target branch (full E2E, no AI selection)
60+
- name: Check release or stable target branch (full E2E, no AI selection)
6161
id: check-release-target
6262
shell: bash
6363
run: |
6464
echo "SKIP=false" >> "$GITHUB_OUTPUT"
6565
BASE='${{ inputs.base-ref }}'
66-
if [[ -n "$BASE" && "$BASE" == release/* ]]; then
66+
if [[ -n "$BASE" && ( "$BASE" == release/* || "$BASE" == "stable" ) ]]; then
6767
echo "SKIP=true" >> "$GITHUB_OUTPUT"
68-
echo "⏭️ Base branch is release/* — skipping AI E2E selection; full E2E suite will run"
68+
echo "⏭️ Base branch is release/* or stable — skipping AI E2E selection; full E2E suite will run"
6969
fi
7070
7171
- name: Checkout for PR analysis
@@ -142,9 +142,9 @@ runs:
142142
echo "SKIP_REASON=skip-smart-e2e-selection label found" >> "$GITHUB_OUTPUT"
143143
echo "ai_confidence=100" >> "$GITHUB_OUTPUT"
144144
elif [[ "${{ steps.check-release-target.outputs.SKIP }}" == "true" ]]; then
145-
echo "⏭️ Skipping AI analysis - PR targets a release branch (release/*)"
145+
echo "⏭️ Skipping AI analysis - PR targets a release or stable branch"
146146
echo "SKIPPED=true" >> "$GITHUB_OUTPUT"
147-
echo "SKIP_REASON=PR targets a release branch (release/*)" >> "$GITHUB_OUTPUT"
147+
echo "SKIP_REASON=PR targets a release or stable branch (release/* or stable)" >> "$GITHUB_OUTPUT"
148148
echo "ai_confidence=100" >> "$GITHUB_OUTPUT"
149149
else
150150
echo "✅ Running AI analysis for PR #$PR_NUMBER"

.github/guidelines/E2E_DECISION_TREE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Flakiness detection is applied to modified E2E test files in PRs:
5656

5757
## Release branches
5858

59-
PRs to release branches (cherry-picked from main) are exempt from the following:
59+
PRs to release branches (cherry-picks from main to release/\* branches and PRs to stable branch) are exempt from the following:
6060

6161
- Label `pr-not-ready-for-e2e` is not applied
6262
- Smart AI E2E selection is skipped - all E2E suites are run (if changes are not ignorable-only, e.g. only docs)

.github/rules/filter-rules.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ config_files: &config_files
4444
# CI/GITHUB FILES — overridden by e2e_related_workflows below
4545
ci_files: &ci_files
4646
- '.github/**'
47-
- 'bitrise.yml'
4847

4948
# ALL IGNORABLE FILES - safe to skip E2E
5049
e2e_ignorable:

.github/scripts/bitrise/.yarnrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/scripts/bitrise/bitrise-results-check.ts

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)