diff --git a/.circleci/config.yml b/.circleci/config.yml index 5e3a1487b..637b64611 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,6 +52,9 @@ workflows: requires: - prep-deps - prep-build-desktop: + filters: + branches: + ignore: master requires: - prep-deps - prep-build-flask: @@ -134,6 +137,9 @@ workflows: requires: - prep-build-beta - validate-source-maps-desktop: + filters: + branches: + ignore: master requires: - prep-build-desktop - validate-source-maps-flask: @@ -148,6 +154,9 @@ workflows: - prep-deps - prep-build-beta - test-mozilla-lint-desktop: + filters: + branches: + ignore: master requires: - prep-deps - prep-build-desktop @@ -392,25 +401,9 @@ jobs: - checkout - attach_workspace: at: . - - when: - condition: - not: - matches: - pattern: /^master$/ - value: << pipeline.git.branch >> - steps: - - run: - name: build:dist - command: yarn build --build-type desktop dist - - when: - condition: - matches: - pattern: /^master$/ - value: << pipeline.git.branch >> - steps: - - run: - name: build:prod - command: yarn build --build-type desktop prod + - run: + name: build:dist + command: yarn build --build-type desktop dist - run: name: build:debug command: find dist/ -type f -exec md5sum {} \; | sort -k 2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 005691832..2f30379c3 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] +## [10.26.1] +### Fixed +- Fix main build by modifying desktop build steps ([#18112](https://github.com/MetaMask/metamask-extension/pull/18112)) + ## [10.26.0] ### Added - Adding browser outdated notification ([#17027](https://github.com/MetaMask/metamask-extension/pull/17027)) @@ -3528,7 +3532,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Uncategorized - Added the ability to restore accounts from seed words. -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.26.0...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.26.1...HEAD +[10.26.1]: https://github.com/MetaMask/metamask-extension/compare/v10.26.0...v10.26.1 [10.26.0]: https://github.com/MetaMask/metamask-extension/compare/v10.25.0...v10.26.0 [10.25.0]: https://github.com/MetaMask/metamask-extension/compare/v10.24.2...v10.25.0 [10.24.2]: https://github.com/MetaMask/metamask-extension/compare/v10.24.1...v10.24.2 diff --git a/package.json b/package.json index 5897ea23d..c0e532056 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "10.26.0", + "version": "10.26.1", "private": true, "repository": { "type": "git",