From 858abe18e12d0575ded8f77634d6b58d41904539 Mon Sep 17 00:00:00 2001 From: Edward Foyle Date: Tue, 3 Aug 2021 12:04:15 -0700 Subject: [PATCH] chore: rename master -> main branch (#7811) --- .circleci/config.base.yml | 28 ++++++++++++------------ .circleci/config.yml | 28 ++++++++++++------------ .github/ISSUE_TEMPLATE/1.bug_report.yaml | 6 ++--- package.json | 6 ++--- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml index da12b533532..cec0d9eccd9 100644 --- a/.circleci/config.base.yml +++ b/.circleci/config.base.yml @@ -636,7 +636,7 @@ workflows: filters: branches: only: - - master + - main jobs: - build - publish_to_local_registry: @@ -658,7 +658,7 @@ workflows: filters: branches: only: - - master + - main jobs: - build - cleanup_resources: @@ -684,7 +684,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -697,7 +697,7 @@ workflows: filters: branches: only: - - master + - main - beta - /tagged-release\/.*/ - /run-e2e\/*./ @@ -708,7 +708,7 @@ workflows: filters: branches: only: - - master + - main - beta - release - /tagged-release\/.*/ @@ -725,7 +725,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ - amplify_e2e_tests: @@ -739,7 +739,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -758,7 +758,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -776,7 +776,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -790,7 +790,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -804,7 +804,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -818,7 +818,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -832,7 +832,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -901,7 +901,7 @@ workflows: branches: only: - release - - master + - main - beta - /tagged-release\/.*/ - /tagged-release-without-e2e-tests\/.*/ diff --git a/.circleci/config.yml b/.circleci/config.yml index b0610449790..81056d4ef47 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2054,7 +2054,7 @@ workflows: filters: branches: only: - - master + - main jobs: - build - publish_to_local_registry: @@ -2076,7 +2076,7 @@ workflows: filters: branches: only: - - master + - main jobs: - build - cleanup_resources: @@ -2101,7 +2101,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -2114,7 +2114,7 @@ workflows: filters: branches: only: - - master + - main - beta - /tagged-release\/.*/ - /run-e2e\/*./ @@ -2125,7 +2125,7 @@ workflows: filters: branches: only: - - master + - main - beta - release - /tagged-release\/.*/ @@ -2142,7 +2142,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ - done_with_node_e2e_tests: @@ -2214,7 +2214,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -2228,7 +2228,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -2242,7 +2242,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -2256,7 +2256,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -2270,7 +2270,7 @@ workflows: filters: branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -2338,7 +2338,7 @@ workflows: branches: only: - release - - master + - main - beta - /tagged-release\/.*/ - /tagged-release-without-e2e-tests\/.*/ @@ -2361,7 +2361,7 @@ workflows: filters: &ref_10 branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: @@ -2833,7 +2833,7 @@ workflows: filters: &ref_13 branches: only: - - master + - main - /tagged-release\/.*/ - /run-e2e\/*./ requires: diff --git a/.github/ISSUE_TEMPLATE/1.bug_report.yaml b/.github/ISSUE_TEMPLATE/1.bug_report.yaml index 1caff965352..15d8c24607c 100644 --- a/.github/ISSUE_TEMPLATE/1.bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/1.bug_report.yaml @@ -4,13 +4,13 @@ description: Create a report to help us improve Amplify CLI body: - type: markdown attributes: - value: | + value: | Thanks for taking the time to fill out this bug report! Try to include as much information as you can. For reference, the current version of the Amplify CLI is . **Note**: If your issue is regarding the AWS Amplify Console service, please log it in the [Amplify Console GitHub Issue Tracker](https://github.com/aws-amplify/amplify-console/issues). - + - type: checkboxes attributes: label: | @@ -20,7 +20,7 @@ body: required: true - label: I have [searched for duplicate or closed issues](https://github.com/aws-amplify/amplify-cli/issues?q=is%3Aissue+). required: true - - label: I have read the guide for [submitting bug reports](https://github.com/aws-amplify/amplify-cli/blob/master/CONTRIBUTING.md#bug-reports). + - label: I have read the guide for [submitting bug reports](https://github.com/aws-amplify/amplify-cli/blob/main/CONTRIBUTING.md#bug-reports). required: true - label: I have done my best to include a minimal, self-contained set of instructions for consistently reproducing the issue. required: true diff --git a/package.json b/package.json index 216e34fee47..73692b1590f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "description": "amplify-cli", "scripts": { - "test-changed": "lerna run test --since master", + "test-changed": "lerna run test --since main", "test": "lerna run test", "test-ci": "lerna run test --concurrency 1 -- --ci -i", "e2e": "lerna run e2e", @@ -30,11 +30,11 @@ "pkg-build": "cp pkg/package.json build/node_modules/package.json && pkg -t node12-macos-x64,node12-linux-x64,node12-win-x64 build/node_modules --out-path out", "pkg-all": "yarn pkg-install && yarn pkg-prune && yarn pkg-transpile && yarn pkg-build", "pkg-all-local": "yarn verdaccio-start && yarn verdaccio-connect && yarn publish-to-verdaccio && yarn pkg-all && yarn verdaccio-disconnect", - "publish:master": "lerna publish --canary --force-publish --preid=alpha --exact --include-merged-tags --conventional-prerelease --no-verify-access --yes", + "publish:main": "lerna publish --canary --force-publish --preid=alpha --exact --include-merged-tags --conventional-prerelease --no-verify-access --yes", "publish:beta": "lerna publish --exact --dist-tag=beta --preid=beta --conventional-commits --conventional-prerelease --message 'chore(release): Publish [ci skip]' --no-verify-access --yes", "publish:tag": "lerna publish --exact --dist-tag=$NPM_TAG --preid=$NPM_TAG --conventional-commits --conventional-prerelease --message 'chore(release): Publish tagged release $NPM_TAG [ci skip]' --no-verify-access --yes", "publish:release": "lerna publish --conventional-commits --exact --yes --message 'chore(release): Publish [ci skip]' --no-verify-access", - "postpublish:release": "git fetch . release:master && git push origin master", + "postpublish:release": "git fetch . release:main && git push origin main", "yarn-use-bash": "yarn config set script-shell /bin/bash", "verdaccio-start": "source .circleci/local_publish_helpers.sh && startLocalRegistry \"$(pwd)/.circleci/verdaccio.yaml\"", "verdaccio-clean": "rimraf ../verdaccio-cache",