diff --git a/.circleci/config.yml b/.circleci/config.yml index 83c5643400a4..2553c6d4f5de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,12 +45,12 @@ rc_branch_only: &rc_branch_only only: - /^Version-v(\d+)[.](\d+)[.](\d+)/ -main_master_rc_only: &main_master_rc_only +main_stable_rc_only: &main_stable_rc_only filters: branches: only: - main - - master + - stable - /^Version-v(\d+)[.](\d+)[.](\d+)/ aliases: @@ -124,7 +124,7 @@ workflows: filters: branches: ignore: - - master + - stable - test-deps-audit: requires: - prep-deps @@ -174,7 +174,7 @@ workflows: requires: - prep-deps - prep-build-test-flask-mv2: - <<: *main_master_rc_only + <<: *main_stable_rc_only requires: - prep-deps - prep-build-test-mmi: @@ -202,7 +202,7 @@ workflows: requires: - prep-deps - test-e2e-chrome-webpack: - <<: *main_master_rc_only + <<: *main_stable_rc_only requires: - prep-build-test-webpack - get-changed-files-with-git-diff @@ -211,7 +211,7 @@ workflows: - prep-build-test - get-changed-files-with-git-diff - test-e2e-firefox: - <<: *main_master_rc_only + <<: *main_stable_rc_only requires: - prep-build-test-mv2 - get-changed-files-with-git-diff @@ -231,7 +231,7 @@ workflows: - prep-build-test-flask - get-changed-files-with-git-diff - test-e2e-firefox-flask: - <<: *main_master_rc_only + <<: *main_stable_rc_only requires: - prep-build-test-flask-mv2 - test-e2e-chrome-mmi: @@ -339,7 +339,7 @@ workflows: - job-publish-release: filters: branches: - only: master + only: stable requires: - prep-deps - prep-build @@ -407,7 +407,7 @@ jobs: condition: not: matches: - pattern: /^master$/ + pattern: /^stable$/ value: << pipeline.git.branch >> steps: - run: @@ -481,7 +481,7 @@ jobs: # This job is used for the e2e quality gate. # It must be run before any job which uses the run-all.js script. - # The job is skipped in main, master or RC branches. + # The job is skipped in main, stable or RC branches. get-changed-files-with-git-diff: executor: node-browsers-small steps: @@ -562,7 +562,7 @@ jobs: condition: not: matches: - pattern: /^master$/ + pattern: /^stable$/ value: << pipeline.git.branch >> steps: - run: @@ -571,7 +571,7 @@ jobs: - when: condition: matches: - pattern: /^master$/ + pattern: /^stable$/ value: << pipeline.git.branch >> steps: - run: @@ -599,7 +599,7 @@ jobs: condition: not: matches: - pattern: /^master$/ + pattern: /^stable$/ value: << pipeline.git.branch >> steps: - run: @@ -608,7 +608,7 @@ jobs: - when: condition: matches: - pattern: /^master$/ + pattern: /^stable$/ value: << pipeline.git.branch >> steps: - run: @@ -642,7 +642,7 @@ jobs: condition: not: matches: - pattern: /^master$/ + pattern: /^stable$/ value: << pipeline.git.branch >> steps: - run: @@ -651,7 +651,7 @@ jobs: - when: condition: matches: - pattern: /^master$/ + pattern: /^stable$/ value: << pipeline.git.branch >> steps: - run: @@ -686,7 +686,7 @@ jobs: condition: not: matches: - pattern: /^master$/ + pattern: /^stable$/ value: << pipeline.git.branch >> steps: - run: @@ -695,7 +695,7 @@ jobs: - when: condition: matches: - pattern: /^master$/ + pattern: /^stable$/ value: << pipeline.git.branch >> steps: - run: @@ -727,7 +727,7 @@ jobs: condition: not: matches: - pattern: /^master$/ + pattern: /^stable$/ value: << pipeline.git.branch >> steps: - run: @@ -736,7 +736,7 @@ jobs: - when: condition: matches: - pattern: /^master$/ + pattern: /^stable$/ value: << pipeline.git.branch >> steps: - run: diff --git a/.circleci/scripts/check_mmi_trigger.sh b/.circleci/scripts/check_mmi_trigger.sh index b2a5ca13734d..46ae1dca53c6 100755 --- a/.circleci/scripts/check_mmi_trigger.sh +++ b/.circleci/scripts/check_mmi_trigger.sh @@ -9,7 +9,7 @@ if [ -z "$CIRCLE_PULL_REQUEST" ] || [ -z "$GITHUB_TOKEN" ]; then exit 0 fi -if [[ $CIRCLE_BRANCH = 'main' || $CIRCLE_BRANCH = 'master' || $CIRCLE_BRANCH =~ ^Version-v[0-9.]* ]]; then +if [[ $CIRCLE_BRANCH = 'main' || $CIRCLE_BRANCH = 'stable' || $CIRCLE_BRANCH =~ ^Version-v[0-9.]* ]]; then echo "Long-running branch detected, running MMI tests." echo "run_mmi_tests=true" > mmi_trigger.env exit 0 diff --git a/.circleci/scripts/release-create-release-pr.sh b/.circleci/scripts/release-create-release-pr.sh index 9aa5d39bdb2d..9f47e7dffd31 100755 --- a/.circleci/scripts/release-create-release-pr.sh +++ b/.circleci/scripts/release-create-release-pr.sh @@ -26,7 +26,7 @@ function install_github_cli () } version="${CIRCLE_BRANCH/Version-v/}" -base_branch='master' +base_branch='stable' if [[ -n "${CI_PULL_REQUEST:-}" ]] then diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 41d6433db7d7..77639fc65fd1 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -18,7 +18,7 @@ When you're done with your project / bugfix / feature and ready to submit a PR, - [ ] **Meet the spec**: Make sure the PR adds functionality that matches the issue you're closing. This is especially important for bounties: sometimes design or implementation details are included in the conversation, so read carefully! - [ ] **Close the issue**: If this PR closes an open issue, fill out the "Related issues" section with `Fixes: #$ISSUE_NUMBER`. Ex. For closing issue 418, include the line `Fixes: #418`. If it doesn't close the issue but addresses it partially, just include a reference to the issue number, like `#418`. - [ ] **Keep it simple**: Try not to include multiple features in a single PR, and don't make extraneous changes outside the scope of your contribution. All those touched files make things harder to review ;) -- [ ] **PR against `main`**: Submit your PR against the `main` branch. This is where we merge new features so they get some time to receive extra testing before being pushed to `master` for production. If your PR is a hot-fix that needs to be published urgently, you may submit a PR against the `master` branch, but this PR will receive tighter scrutiny before merging. +- [ ] **PR against `main`**: Submit your PR against the `main` branch. This is where we merge new features so they get some time to receive extra testing before being pushed to `stable` for production. If your PR is a hot-fix that needs to be published urgently, you may submit a PR against the `stable` branch, but this PR will receive tighter scrutiny before merging. - [ ] **Get reviewed by MetaMask Internal Developers**: All PRs require 2 approvals from MetaMask Internal Developers before merging. - [ ] **Ensure the PR is correctly labeled.**: More detail about PR labels can be found [here](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md). - [ ] **PR Titles**: Must adhere to the [Conventional Commits specification](https://www.conventionalcommits.org) diff --git a/.github/workflows/close-bug-report.yml b/.github/workflows/close-bug-report.yml index 46dcd0a9e9ff..8ea6600c516b 100644 --- a/.github/workflows/close-bug-report.yml +++ b/.github/workflows/close-bug-report.yml @@ -3,7 +3,7 @@ name: Close release bug report issue when release branch gets merged on: pull_request: branches: - - master + - stable types: - closed diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a4b5bef7c9e7..3320a22ea469 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,7 +13,7 @@ name: "CodeQL" on: push: - branches: [ main, Version-v*, cla-signatures, master, snaps ] + branches: [ main, Version-v*, cla-signatures, stable, snaps ] pull_request: # The branches below must be a subset of the branches above branches: [ main ] diff --git a/.github/workflows/create-bug-report.yml b/.github/workflows/create-bug-report.yml index c5164af00c02..7f55bd4da6c9 100644 --- a/.github/workflows/create-bug-report.yml +++ b/.github/workflows/create-bug-report.yml @@ -23,7 +23,7 @@ jobs: payload=$(cat <