From b3545209c6ddf32485b974414f549fff3353f94e Mon Sep 17 00:00:00 2001 From: Chloe Gao Date: Thu, 9 Jan 2025 18:28:30 +0100 Subject: [PATCH 1/6] test --- .github/workflows/main.yml | 2 +- CHANGELOG.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6e5a5121f336..2975a5c730eb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -83,7 +83,7 @@ jobs: - check-workflows - test-lint-shellcheck - test-lint - - test-lint-changelog + - ${{ !startsWith(github.ref_name, 'Version-v') && 'test-lint-changelog' }} - test-lint-lockfile - test-yarn-dedupe - test-deps-depcheck diff --git a/CHANGELOG.md b/CHANGELOG.md index eda15db00496..138c36038379 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.10.2] +### Uncategorized +- Display the "Amount" row within the advanced view of contract interaction confirmations, and whenever the amount being sent differs from the "You Send" row of the transaction simulation information by more than 5% ([#29131](https://github.com/MetaMask/metamask-extension/pull/29131)) + ## [12.9.2] ### Changed - Display the "Amount" row within the advanced view of contract interaction confirmations, and whenever the amount being sent differs from the "You Send" row of the transaction simulation information by more than 5% ([#29131](https://github.com/MetaMask/metamask-extension/pull/29131)) From fe7f3ca2126491c44c56f2065562425bd12f8c72 Mon Sep 17 00:00:00 2001 From: Chloe Gao Date: Tue, 14 Jan 2025 10:53:07 +0100 Subject: [PATCH 2/6] fix --- .github/workflows/main.yml | 2 +- .github/workflows/test-lint-changelog.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index baf84952b5b2..532c8ec097cd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -98,7 +98,7 @@ jobs: - check-workflows - test-lint-shellcheck - test-lint - - ${{ !startsWith(github.ref_name, 'Version-v') && 'test-lint-changelog' }} + - test-lint-changelog - test-lint-lockfile - test-yarn-dedupe - test-deps-depcheck diff --git a/.github/workflows/test-lint-changelog.yml b/.github/workflows/test-lint-changelog.yml index 9e8ee0e992c8..d8e8bd1f9065 100644 --- a/.github/workflows/test-lint-changelog.yml +++ b/.github/workflows/test-lint-changelog.yml @@ -24,4 +24,5 @@ jobs: # For a `pull_request` event, the branch is `github.head_ref``. # For a `push` event, the branch is `github.ref_name`. if: ${{ startsWith(github.head_ref || github.ref_name, 'Version-v') }} + continue-on-error: true run: .circleci/scripts/validate-changelog-in-rc.sh From 6304fce54b0a6109a1dc1b9f1fef27b110bc4e62 Mon Sep 17 00:00:00 2001 From: Chloe Gao Date: Tue, 14 Jan 2025 11:25:26 +0100 Subject: [PATCH 3/6] revert change --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 138c36038379..eda15db00496 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [12.10.2] -### Uncategorized -- Display the "Amount" row within the advanced view of contract interaction confirmations, and whenever the amount being sent differs from the "You Send" row of the transaction simulation information by more than 5% ([#29131](https://github.com/MetaMask/metamask-extension/pull/29131)) - ## [12.9.2] ### Changed - Display the "Amount" row within the advanced view of contract interaction confirmations, and whenever the amount being sent differs from the "You Send" row of the transaction simulation information by more than 5% ([#29131](https://github.com/MetaMask/metamask-extension/pull/29131)) From 4aca5df85c97f556b66171e7f0c492b97e090310 Mon Sep 17 00:00:00 2001 From: Chloe Gao Date: Tue, 14 Jan 2025 11:49:40 +0100 Subject: [PATCH 4/6] fix --- .github/workflows/main.yml | 18 +++++++++++++++++- .github/workflows/test-lint-changelog.yml | 1 - 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 532c8ec097cd..087293f2a166 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -111,9 +111,25 @@ jobs: outputs: PASSED: ${{ steps.set-output.outputs.PASSED }} steps: + - name: Check changelog lint status + id: changelog-status + run: | + if [[ "${{ github.ref_name }}" == Version-v* ]]; then + echo "Ignoring failure for changelog validation in Version-v branch." + echo "IGNORED=true" >> $GITHUB_ENV + else + echo "IGNORED=false" >> $GITHUB_ENV + fi + - name: Set PASSED output id: set-output - run: echo "PASSED=true" >> "$GITHUB_OUTPUT" + run: | + if [[ "${{ env.IGNORED }}" == "true" ]]; then + echo "PASSED=true" >> "$GITHUB_OUTPUT" + else + echo "PASSED=false" >> "$GITHUB_OUTPUT" + exit 1 + fi all-jobs-pass: name: All jobs pass diff --git a/.github/workflows/test-lint-changelog.yml b/.github/workflows/test-lint-changelog.yml index d8e8bd1f9065..9e8ee0e992c8 100644 --- a/.github/workflows/test-lint-changelog.yml +++ b/.github/workflows/test-lint-changelog.yml @@ -24,5 +24,4 @@ jobs: # For a `pull_request` event, the branch is `github.head_ref``. # For a `push` event, the branch is `github.ref_name`. if: ${{ startsWith(github.head_ref || github.ref_name, 'Version-v') }} - continue-on-error: true run: .circleci/scripts/validate-changelog-in-rc.sh From 7e8c29c02411a7779081db5c676fb26b366555ec Mon Sep 17 00:00:00 2001 From: Chloe Gao Date: Tue, 14 Jan 2025 11:55:22 +0100 Subject: [PATCH 5/6] test --- .github/workflows/main.yml | 6 +++--- CHANGELOG.md | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 087293f2a166..ccb4c3d71bad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -116,15 +116,15 @@ jobs: run: | if [[ "${{ github.ref_name }}" == Version-v* ]]; then echo "Ignoring failure for changelog validation in Version-v branch." - echo "IGNORED=true" >> $GITHUB_ENV + echo "IGNORED=true" >> "$GITHUB_ENV" else - echo "IGNORED=false" >> $GITHUB_ENV + echo "IGNORED=false" >> "$GITHUB_ENV" fi - name: Set PASSED output id: set-output run: | - if [[ "${{ env.IGNORED }}" == "true" ]]; then + if [[ "${IGNORED}" == "true" ]]; then echo "PASSED=true" >> "$GITHUB_OUTPUT" else echo "PASSED=false" >> "$GITHUB_OUTPUT" diff --git a/CHANGELOG.md b/CHANGELOG.md index eda15db00496..8d92aead7873 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.10.0] +### Uncategorized +- Improved phishing detection protections ([#28782](https://github.com/MetaMask/metamask-extension/pull/28782)) + ## [12.9.2] ### Changed - Display the "Amount" row within the advanced view of contract interaction confirmations, and whenever the amount being sent differs from the "You Send" row of the transaction simulation information by more than 5% ([#29131](https://github.com/MetaMask/metamask-extension/pull/29131)) From 4d3d7c579b669f4dc1b664c0dde3611dfc91281f Mon Sep 17 00:00:00 2001 From: Chloe Gao Date: Tue, 14 Jan 2025 11:57:31 +0100 Subject: [PATCH 6/6] test --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ccb4c3d71bad..03cb60c8d3a3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -114,7 +114,8 @@ jobs: - name: Check changelog lint status id: changelog-status run: | - if [[ "${{ github.ref_name }}" == Version-v* ]]; then + BRANCH_NAME="${{ github.ref_name }}" + if [[ "$BRANCH_NAME" == Version-v* ]]; then echo "Ignoring failure for changelog validation in Version-v branch." echo "IGNORED=true" >> "$GITHUB_ENV" else