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: 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 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",