Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ on:
required: false
type: string
default: ''
upload_to_sentry:
description: 'If true, enable Sentry CLI upload of JS source maps and native debug symbols during the build'
required: false
type: boolean
default: false
workflow_dispatch:
inputs:
build_name:
Expand Down Expand Up @@ -50,6 +55,11 @@ on:
required: false
type: boolean
default: false
upload_to_sentry:
description: 'Upload JS source maps and native debug symbols to Sentry during the build (requires Sentry auth in the build environment)'
required: false
type: boolean
default: false

permissions:
contents: read
Expand Down Expand Up @@ -313,6 +323,19 @@ jobs:
cat ios/.xcode.env.local
node --version

# Sentry: build.sh defaults SENTRY_DISABLE_AUTO_UPLOAD=true; set false only when opted in.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of this couldn't we just add the environment variable in builds.yml?

I see that we only set this for rc and production builds to false in build.sh

- name: Configure Sentry upload
env:
UPLOAD_TO_SENTRY: ${{ inputs.upload_to_sentry }}
run: |
if [ "$UPLOAD_TO_SENTRY" = "true" ]; then
echo "SENTRY_DISABLE_AUTO_UPLOAD=false" >> "$GITHUB_ENV"
echo "✅ Sentry auto-upload enabled for this build"
else
echo "SENTRY_DISABLE_AUTO_UPLOAD=true" >> "$GITHUB_ENV"
echo "ℹ️ Sentry auto-upload disabled"
fi

# Build with retry logic. Timeouts: 55min per attempt, 115min total for step, 120min job
- name: Build ${{ matrix.platform }}
timeout-minutes: 115
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ android {
applicationId "io.metamask"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionName "7.72.0"
versionCode 3607
versionName "7.71.0"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Android versionName downgraded from 7.72.0 to 7.71.0

High Severity

The Android versionName was changed from "7.72.0" to "7.71.0", which is a version downgrade. This is inconsistent with every other version reference in the project: iOS MARKETING_VERSION is 7.72.0, bitrise.yml VERSION_NAME is 7.72.0, and FLASK_VERSION_NAME is 7.72.0. This mismatch likely causes the Android build to ship with the wrong marketing version.

Fix in Cursor Fix in Web

versionCode 4138
testBuildType System.getProperty('testBuildType', 'debug')
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
manifestPlaceholders.MM_BRANCH_KEY_TEST = "$System.env.MM_BRANCH_KEY_TEST"
Expand Down
4 changes: 2 additions & 2 deletions bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3534,13 +3534,13 @@ app:
VERSION_NAME: 7.72.0
- opts:
is_expand: false
VERSION_NUMBER: 3911
VERSION_NUMBER: 4138
- opts:
is_expand: false
FLASK_VERSION_NAME: 7.72.0
- opts:
is_expand: false
FLASK_VERSION_NUMBER: 3911
FLASK_VERSION_NUMBER: 4138
- opts:
is_expand: false
ANDROID_APK_LINK: ''
Expand Down
12 changes: 6 additions & 6 deletions ios/MetaMask.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1281,7 +1281,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3911;
CURRENT_PROJECT_VERSION = 4138;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1350,7 +1350,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3911;
CURRENT_PROJECT_VERSION = 4138;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1416,7 +1416,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3911;
CURRENT_PROJECT_VERSION = 4138;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1483,7 +1483,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3911;
CURRENT_PROJECT_VERSION = 4138;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1646,7 +1646,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3911;
CURRENT_PROJECT_VERSION = 4138;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1716,7 +1716,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3911;
CURRENT_PROJECT_VERSION = 4138;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down
Loading