Skip to content

Commit 075db60

Browse files
authored
Merge branch 'main' into sidebar-rebase-b
2 parents 8720577 + 5a5b17a commit 075db60

File tree

558 files changed

+21095
-7567
lines changed

Some content is hidden

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

558 files changed

+21095
-7567
lines changed

.depcheckrc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ ignores:
9696
- '@metamask/bitcoin-wallet-snap'
9797
- '@metamask/solana-wallet-snap'
9898
- '@metamask/institutional-wallet-snap'
99+
- '@metamask/gator-permissions-snap'
100+
- '@metamask/permissions-kernel-snap'
99101

100102
# files depcheck should not parse
101103
ignorePatterns:

.github/CODEOWNERS

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,16 @@ tailwind.config.js @MetaMask/design-system-engineers
6565
**/pages/notification*/** @MetaMask/notifications
6666
**/utils/notification.util.ts @MetaMask/notifications
6767

68-
# Identity team is responsible for authentication and backup and sync inside the Extension.
69-
# Slack handle: @identity_team | Slack channel: #metamask-identity
70-
**/identity/** @MetaMask/identity
71-
7268
# Accounts team is responsible for code related with snap management accounts
7369
# Slack handle: @accounts-team-devs | Slack channel: #metamask-accounts-team
7470

7571
app/scripts/lib/snap-keyring @MetaMask/accounts-engineers
7672

77-
# Multichain Accounts
78-
# This feature is owned by the multichain account tiger team
73+
# Multichain Accounts, Authentication, Backup and sync
74+
# Those features are owned by the multichain account tiger team
7975
# Slack handle: @multichain-accounts-devs | Slack channel: #metamask-bip44-team
8076
**/multichain-accounts/** @MetaMask/accounts-engineers
77+
**/identity/** @MetaMask/accounts-engineers
8178

8279
# Swaps-Bridge team to own code for the swaps folder
8380
ui/pages/swaps @MetaMask/swaps-engineers

.github/scripts/push-firefox-bundle-script.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,16 @@ fi
99

1010
git config --global user.name "MetaMask Bot"
1111
git config --global user.email [email protected]
12-
version=$(git show -s --format='%s' HEAD | grep -Eo 'v[0-9]+\.[0-9]+\.[0-9]+')
12+
rawVersion=$(git show -s --format='%s' HEAD | grep -Eo 'release/[0-9]+\.[0-9]+\.[0-9]+' | sed 's|release/||')
13+
version="v${rawVersion}"
14+
15+
# Validate that the version was successfully extracted
16+
if [[ -z "${rawVersion}" ]]; then
17+
echo "::error:: Failed to extract version from commit message. Ensure it follows the 'release/x.y.z' format."
18+
exit 1
19+
fi
20+
21+
echo "Version extracted: ${version}"
1322

1423
git clone "https://${FIREFOX_BUNDLE_SCRIPT_TOKEN}@github.com/MetaMask/firefox-bundle-script.git"
1524
cd firefox-bundle-script

.github/scripts/release-create-gh-release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ function publish_tag() {
4747

4848
current_commit_msg=$(git show -s --format='%s' HEAD)
4949

50-
if [[ "${current_commit_msg}" =~ Version[-[:space:]](v[[:digit:]]+.[[:digit:]]+.[[:digit:]]+) ]]; then
51-
tag="${BASH_REMATCH[1]}"
50+
if [[ "${current_commit_msg}" =~ release/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+) ]]; then
51+
tag="v${BASH_REMATCH[1]}"
5252
flask_version="$(print_build_version 'flask')"
5353

5454
printf '%s\n' 'Creating GitHub Release'

.github/workflows/add-release-label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
is-high-risk-environment: false
1919
fetch-depth: 0 # This is needed to checkout all branches
2020
skip-allow-scripts: true
21-
yarn-custom-url: ${{ vars.YARN_URL }}
21+
use-yarn-hydrate: true
2222

2323
- name: Get the next semver version
2424
id: get-next-semver-version

.github/workflows/build-storybook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
is-high-risk-environment: true
2222
skip-allow-scripts: true
23-
yarn-custom-url: ${{ vars.YARN_URL }}
23+
use-yarn-hydrate: true
2424

2525
- name: Build storybook
2626
run: yarn storybook:build

.github/workflows/build-ts-migration-dashboard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
is-high-risk-environment: true
2121
skip-allow-scripts: true
22-
yarn-custom-url: ${{ vars.YARN_URL }}
22+
use-yarn-hydrate: true
2323

2424
- name: Build ts migration dashboard
2525
run: yarn ts-migration:dashboard:build

.github/workflows/check-attributions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
is-high-risk-environment: false
1717
skip-allow-scripts: true
18-
yarn-custom-url: ${{ vars.YARN_URL }}
18+
use-yarn-hydrate: true
1919

2020
- name: Check attributions changes
2121
run: yarn attributions:check

.github/workflows/check-pr-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
is-high-risk-environment: false
2828
skip-allow-scripts: true
29-
yarn-custom-url: ${{ vars.YARN_URL }}
29+
use-yarn-hydrate: true
3030

3131
- name: Check PR has required labels
3232
env:

.github/workflows/check-template-and-add-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
is-high-risk-environment: false
1919
skip-allow-scripts: true
20-
yarn-custom-url: ${{ vars.YARN_URL }}
20+
use-yarn-hydrate: true
2121

2222
- name: Check template and add labels
2323
id: check-template-and-add-labels

0 commit comments

Comments
 (0)