From 51bdb2e99f1099f9619945dadf47832259d4302e Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Mon, 9 Sep 2024 17:58:30 -0230 Subject: [PATCH 1/3] ci: Ensure get-changed-files-with-git-diff scripts does not run on the master branch (#26992) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** For some reason, `process.env.CIRCLE_PULL_REQUEST` is defined when running the `git-diff-develop.ts` script on the master branch. This causes that script to fail, which in turn prevents the build from passing. This PR ensures that script does not run on the master branch. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26992?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** ### **Before** ### **After** ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] 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/develop/.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. --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index fd9b78259610..01a6a5791bb4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -106,6 +106,10 @@ workflows: - check-pr-tag - prep-deps - get-changed-files-with-git-diff: + filters: + branches: + ignore: + - master requires: - prep-deps - test-deps-audit: From 2d2c27f2ae8bcc91dcaeaac912d4f85b8b3b746f Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Tue, 10 Sep 2024 13:09:32 -0230 Subject: [PATCH 2/3] v12.2.2 --- CHANGELOG.md | 7 ++++++- package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 523899463ec5..b6d7f827ca85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [12.2.2] +### Fixed +- This build was needed to fix release publishing on our master branch. It also includes the addition of the missing v12.2.0 changelog. Functionality and code is equivalent to v12.2.0. + ## [12.2.1] ### Fixed - This build was needed to fix release publishing on our master branch. It also includes the addition of the missing v12.2.0 changelog. Functionality and code is equivalent to v12.2.0. @@ -5040,7 +5044,8 @@ Update styles and spacing on the critical error page ([#20350](https://github.c - Added the ability to restore accounts from seed words. -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.2.1...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.2.2...HEAD +[12.2.2]: https://github.com/MetaMask/metamask-extension/compare/v12.2.1...v12.2.2 [12.2.1]: https://github.com/MetaMask/metamask-extension/compare/v12.2.0...v12.2.1 [12.2.0]: https://github.com/MetaMask/metamask-extension/compare/v12.1.3...v12.2.0 [12.1.3]: https://github.com/MetaMask/metamask-extension/compare/v12.1.2...v12.1.3 diff --git a/package.json b/package.json index dad7ae9126d9..174a929240c4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "12.2.1", + "version": "12.2.2", "private": true, "repository": { "type": "git", From 4b4d031a4815bedfc70000a5cf5d5d5d4baedc87 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Tue, 10 Sep 2024 15:51:20 -0230 Subject: [PATCH 3/3] Cherry-pick audit fix v12.2.2 (#27042) Cherry-picks ad9f0f1 (#27041) to v12.2.2 --- .yarnrc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index 1522080c0561..5d4aa7cd4e73 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -51,7 +51,7 @@ npmAuditIgnoreAdvisories: # explicitly from our code. As such, this vulneratibility cannot be exploited # by an external / malicious actor. Meanwhile, once we update to v6+, # path-to-regexp will no longer be used. - - 1099499 + - 1099518 # Temp fix for https://github.com/MetaMask/metamask-extension/pull/16920 for the sake of 11.7.1 hotfix # This will be removed in this ticket https://github.com/MetaMask/metamask-extension/issues/22299