Skip to content

Commit 6dca426

Browse files
runway-github[bot]agangladametamaskbot
authored
temp+fix: cp-13.1.0 bump solana snap (#34887)
## **Description** Bumps the Solana Snap to [v2.1.4](https://github.com/MetaMask/snap-solana-wallet/releases/tag/v2.1.4), bringing in the following: - Changed - Enhance performance by triggering UI refresh jobs only when the UI is open (MetaMask/snap-solana-wallet#490) - Fixed - Increase the compute unit limit used for sending SPL tokens (MetaMask/snap-solana-wallet#492) - Ensure WebSocket connections are open whenever the client becomes active (MetaMask/snap-solana-wallet#489) ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --------- Co-authored-by: Alejandro Garcia Anglada <aganglada@gmail.com> Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
1 parent 6b63526 commit 6dca426

File tree

467 files changed

+12861
-8240
lines changed

Some content is hidden

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

467 files changed

+12861
-8240
lines changed

.eslintrc.base.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ module.exports = {
99
globals: {
1010
document: 'readonly',
1111
window: 'readonly',
12-
// Our ESLint config is stuck at ES2017 because Browserify doesn't support the spread operator.
13-
// We can remove this global after we've migrated away from Browserify and updated our ESLint
14-
// config to at least ES2021.
15-
AggregateError: 'readonly',
1612
},
1713

1814
rules: {

.github/scripts/check-template-and-add-labels.ts

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {
1717
craftRegressionLabel,
1818
externalContributorLabel,
1919
needsTriageLabel,
20-
areaSentryLabel,
2120
flakyTestsLabel,
2221
invalidIssueTemplateLabel,
2322
invalidPullRequestTemplateLabel,
@@ -99,9 +98,8 @@ async function main(): Promise<void> {
9998
labelable.body,
10099
);
101100

102-
// If labelable's author is a bot we skip the rest of the script, including the template checks as bots don't use templates.
103-
// Exception: For issues created the 'sentry-io' bot, we don't skip the rest of the script because there's a specific handling for those issues.
104-
if (knownBots.includes(labelable.author) && labelable.author !== 'sentry-io') {
101+
// If labelable's author is a bot we skip the template checks as bots don't use templates
102+
if (knownBots.includes(labelable.author)) {
105103
console.log(
106104
`${
107105
labelable.type === LabelableType.PullRequest ? 'PR' : 'Issue'
@@ -125,24 +123,6 @@ async function main(): Promise<void> {
125123
process.exit(0); // Stop the process and exit with a success status code
126124
}
127125

128-
if (labelable.author === 'sentry-io') {
129-
console.log(
130-
`Issue ${labelable?.number} was created through Sentry. Issue's description doesn't need to match issue template in that case. Skip template checks.`,
131-
);
132-
await removeLabelFromLabelableIfPresent(
133-
octokit,
134-
labelable,
135-
invalidIssueTemplateLabel,
136-
);
137-
// Add needs triage label ONLY if issue is created (not updated)
138-
if (context.payload.action === 'opened') {
139-
await addNeedsTriageLabelToIssue(octokit, labelable);
140-
}
141-
// Add area-Sentry label to the bug report issue
142-
await addAreaSentryLabelToIssue(octokit, labelable);
143-
process.exit(0); // Stop the process and exit with a success status code
144-
}
145-
146126
if (templateType === TemplateType.GeneralIssue) {
147127
console.log("Issue matches 'general-issue.yml' template.");
148128
await removeLabelFromLabelableIfPresent(
@@ -159,12 +139,10 @@ async function main(): Promise<void> {
159139
);
160140

161141
// Add regression label to the bug report issue
162-
await addRegressionLabelToIssue(octokit, labelable);
142+
addRegressionLabelToIssue(octokit, labelable);
163143

164-
// Add needs triage label ONLY if issue is created (not updated)
165-
if (context.payload.action === 'opened') {
166-
await addNeedsTriageLabelToIssue(octokit, labelable);
167-
}
144+
// Add needs triage label to the bug report issue
145+
addNeedsTriageLabelToIssue(octokit, labelable);
168146
} else {
169147
const errorMessage =
170148
"Issue body does not match any of expected templates ('general-issue.yml' or 'bug-report.yml').\n\nMake sure issue's body includes all section titles.\n\nSections titles are listed here: https://github.com/MetaMask/metamask-extension/blob/main/.github/scripts/shared/template.ts#L14-L37";
@@ -293,13 +271,6 @@ async function addNeedsTriageLabelToIssue(
293271
): Promise<void> {
294272
await addLabelToLabelable(octokit, issue, needsTriageLabel);
295273
}
296-
// This function adds the "area-Sentry" label to the issue if it doesn't have it
297-
async function addAreaSentryLabelToIssue(
298-
octokit: InstanceType<typeof GitHub>,
299-
issue: Labelable,
300-
): Promise<void> {
301-
await addLabelToLabelable(octokit, issue, areaSentryLabel);
302-
}
303274
// This function adds the correct regression label to the issue, and removes other ones
304275
async function addRegressionLabelToIssue(
305276
octokit: InstanceType<typeof GitHub>,

.github/scripts/shared/label.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,10 @@ export const externalContributorLabel: Label = {
2929

3030
export const needsTriageLabel: Label = {
3131
name: 'needs-triage',
32-
color: '68AEE6',
32+
color: '#68AEE6',
3333
description: 'Issue needs to be triaged',
3434
};
3535

36-
export const areaSentryLabel: Label = {
37-
name: 'area-sentry',
38-
color: '5319E7',
39-
description: 'Issue from Sentry',
40-
};
41-
4236
export const flakyTestsLabel: Label = {
4337
name: 'flaky tests',
4438
color: 'BE564E',
@@ -119,14 +113,14 @@ export function craftTeamLabel(teamName: string): Label {
119113
case 'extension-platform':
120114
return {
121115
name: `team-${teamName}`,
122-
color: 'BFD4F2', // light blue
116+
color: '#BFD4F2', // light blue
123117
description: `Extension Platform team`,
124118
};
125119

126120
case 'mobile-platform':
127121
return {
128122
name: `team-${teamName}`,
129-
color: '76E9D0', // light green
123+
color: '#76E9D0', // light green
130124
description: `Mobile Platform team`,
131125
};
132126

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
pull_request:
55
types:
66
- opened
7+
- reopened
8+
- synchronize
79

810
jobs:
911
add-team-label:

.github/workflows/automated-rca.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010

1111
jobs:
1212
automated-rca:
13-
uses: MetaMask/github-tools/.github/workflows/post-gh-rca.yml@727c028d5fdb2b86f6b1cf205b97fa8e79f7de61
13+
uses: MetaMask/github-tools/.github/workflows/post-gh-rca.yml@af33de88e00adce0e41583beb7954d691ad3e304
1414
with:
1515
google-form-base-url: 'https://docs.google.com/forms/d/e/1FAIpQLSfnfEWH7JCFFtvjCHixgyqJdTU3LW3BmTwdF1dDezTNf7m4ig/viewform'
1616
repo-owner: ${{ github.repository_owner }}

.github/workflows/create-release-pr-legacy.yml renamed to .github/workflows/create-release-pr-v2.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: Create Release Pull Request (Legacy)
1+
name: Create Release Pull Request V2
22

33
on:
44
workflow_dispatch:
55
inputs:
66
base-branch:
7-
description: 'The base branch, tag, or SHA for git operations and the pull request. Usually `main`'
7+
description: 'The base branch, tag, or SHA for git operations and the pull request (usually `main`)'
88
required: true
99
semver-version:
1010
description: 'A semantic version, eg: x.x.x'
@@ -14,14 +14,13 @@ on:
1414
required: true
1515
jobs:
1616
create-release-pr:
17-
name: Create Release Pull Request using Github Tools
18-
uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7
17+
uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@dde6d530bebae07d1e50180894ab2cac64170a2c
1918
with:
2019
platform: extension
2120
base-branch: ${{ inputs.base-branch }}
2221
semver-version: ${{ inputs.semver-version }}
2322
previous-version-tag: Version-v${{ inputs.previous-semver-version }}
24-
github-tools-version: fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7
23+
github-tools-version: dde6d530bebae07d1e50180894ab2cac64170a2c
2524
secrets:
2625
# This token needs write permissions to metamask-extension & read permissions to metamask-planning
2726
github-token: ${{ secrets.PR_TOKEN }}

.github/workflows/create-release-pr.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ on:
99
semver-version:
1010
description: 'A semantic version, eg: x.x.x'
1111
required: true
12-
previous-version-ref:
13-
description: 'Previous release version reference (tag or commit hash). eg: v7.7.0'
12+
previous-semver-version:
13+
description: 'Previous semantic version, eg: x.x.x'
1414
required: true
1515

1616
jobs:
1717
create-release-pr:
1818
name: Create Release Pull Request using Github Tools
19-
uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@dde6d530bebae07d1e50180894ab2cac64170a2c
19+
uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7
2020
with:
2121
platform: extension
2222
base-branch: ${{ inputs.base-branch }}
2323
semver-version: ${{ inputs.semver-version }}
24-
previous-version-tag: ${{ inputs.previous-version-ref }}
25-
github-tools-version: dde6d530bebae07d1e50180894ab2cac64170a2c
24+
previous-version-tag: Version-v${{ inputs.previous-semver-version }}
25+
github-tools-version: fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7
2626
secrets:
2727
# This token needs write permissions to metamask-extension & read permissions to metamask-planning
2828
github-token: ${{ secrets.PR_TOKEN }}

.github/workflows/post-merge-validation.yml

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

0 commit comments

Comments
 (0)