Skip to content

Commit

Permalink
chore: rename master -> main branch (aws-amplify#7811)
Browse files Browse the repository at this point in the history
  • Loading branch information
@edwardfoyle @marcvberg
edwardfoyle authored and marcvberg committed Oct 13, 2021
1 parent d2b8bb7 commit 858abe1
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 34 deletions.
28 changes: 14 additions & 14 deletions .circleci/config.base.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ workflows:
filters:
branches:
only:
- master
- main
jobs:
- build
- publish_to_local_registry:
Expand All @@ -658,7 +658,7 @@ workflows:
filters:
branches:
only:
- master
- main
jobs:
- build
- cleanup_resources:
Expand All @@ -684,7 +684,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand All @@ -697,7 +697,7 @@ workflows:
filters:
branches:
only:
- master
- main
- beta
- /tagged-release\/.*/
- /run-e2e\/*./
Expand All @@ -708,7 +708,7 @@ workflows:
filters:
branches:
only:
- master
- main
- beta
- release
- /tagged-release\/.*/
Expand All @@ -725,7 +725,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
- amplify_e2e_tests:
Expand All @@ -739,7 +739,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand All @@ -758,7 +758,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand All @@ -776,7 +776,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand All @@ -790,7 +790,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand All @@ -804,7 +804,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand All @@ -818,7 +818,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand All @@ -832,7 +832,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand Down Expand Up @@ -901,7 +901,7 @@ workflows:
branches:
only:
- release
- master
- main
- beta
- /tagged-release\/.*/
- /tagged-release-without-e2e-tests\/.*/
Expand Down
28 changes: 14 additions & 14 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2054,7 +2054,7 @@ workflows:
filters:
branches:
only:
- master
- main
jobs:
- build
- publish_to_local_registry:
Expand All @@ -2076,7 +2076,7 @@ workflows:
filters:
branches:
only:
- master
- main
jobs:
- build
- cleanup_resources:
Expand All @@ -2101,7 +2101,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand All @@ -2114,7 +2114,7 @@ workflows:
filters:
branches:
only:
- master
- main
- beta
- /tagged-release\/.*/
- /run-e2e\/*./
Expand All @@ -2125,7 +2125,7 @@ workflows:
filters:
branches:
only:
- master
- main
- beta
- release
- /tagged-release\/.*/
Expand All @@ -2142,7 +2142,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
- done_with_node_e2e_tests:
Expand Down Expand Up @@ -2214,7 +2214,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand All @@ -2228,7 +2228,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand All @@ -2242,7 +2242,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand All @@ -2256,7 +2256,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand All @@ -2270,7 +2270,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand Down Expand Up @@ -2338,7 +2338,7 @@ workflows:
branches:
only:
- release
- master
- main
- beta
- /tagged-release\/.*/
- /tagged-release-without-e2e-tests\/.*/
Expand All @@ -2361,7 +2361,7 @@ workflows:
filters: &ref_10
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand Down Expand Up @@ -2833,7 +2833,7 @@ workflows:
filters: &ref_13
branches:
only:
- master
- main
- /tagged-release\/.*/
- /run-e2e\/*./
requires:
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/1.bug_report.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <img src="https://img.shields.io/npm/v/@aws-amplify/cli.svg" />.
**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: |
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit 858abe1

Please sign in to comment.