Skip to content

Commit 705c27d

Browse files
alharris-atalharris-at
committed
chore: flip to instead of for our root branch
1 parent cc9094a commit 705c27d

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

‎.circleci/config.base.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ workflows:
201201
filters:
202202
branches:
203203
only:
204-
- master
204+
- main
205205
- e2e-testing
206206
jobs:
207207
- build:
@@ -231,7 +231,7 @@ workflows:
231231
filters:
232232
branches:
233233
only:
234-
- master
234+
- main
235235
- e2e-testing
236236
- /tagged-release\/.*/
237237
- e2e-test:
@@ -245,7 +245,7 @@ workflows:
245245
filters:
246246
branches:
247247
only:
248-
- master
248+
- main
249249
- e2e-testing
250250
- /tagged-release\/.*/
251251
- deploy:
@@ -258,7 +258,7 @@ workflows:
258258
branches:
259259
only:
260260
- release
261-
- master
261+
- main
262262
- /tagged-release\/.*/
263263
- /tagged-release-without-e2e-tests\/.*/
264264
- done_with_node_e2e_tests:

‎.circleci/config.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ workflows:
378378
filters:
379379
branches:
380380
only:
381-
- master
381+
- main
382382
- e2e-testing
383383
jobs:
384384
- build:
@@ -409,7 +409,7 @@ workflows:
409409
filters:
410410
branches:
411411
only:
412-
- master
412+
- main
413413
- e2e-testing
414414
- /tagged-release\/.*/
415415
- deploy:
@@ -422,7 +422,7 @@ workflows:
422422
branches:
423423
only:
424424
- release
425-
- master
425+
- main
426426
- /tagged-release\/.*/
427427
- /tagged-release-without-e2e-tests\/.*/
428428
- done_with_node_e2e_tests:
@@ -461,7 +461,7 @@ workflows:
461461
filters: &ref_8
462462
branches:
463463
only:
464-
- master
464+
- main
465465
- e2e-testing
466466
- /tagged-release\/.*/
467467
- add-codegen-android-e2e-test:

‎.github/ISSUE_TEMPLATE/1.bug_report.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ body:
2020
required: true
2121
- label: I have [searched for duplicate or closed issues](https://github.com/aws-amplify/amplify-codegen/issues?q=is%3Aissue+).
2222
required: true
23-
- label: I have read the guide for [submitting bug reports](https://github.com/aws-amplify/amplify-codegen/blob/master/CONTRIBUTING.md#bugs).
23+
- label: I have read the guide for [submitting bug reports](https://github.com/aws-amplify/amplify-codegen/blob/main/CONTRIBUTING.md#bugs).
2424
required: true
2525
- label: I have done my best to include a minimal, self-contained set of instructions for consistently reproducing the issue.
2626
required: true

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
Please make sure to read the Pull Request Guidelines:
3-
https://github.com/aws-amplify/amplify-codegen/blob/master/CONTRIBUTING.md#pull-requests
3+
https://github.com/aws-amplify/amplify-codegen/blob/main/CONTRIBUTING.md#pull-requests
44
-->
55

66

@@ -25,7 +25,7 @@ the requirements below.
2525

2626
- [ ] PR description included
2727
- [ ] `yarn test` passes
28-
- [ ] Tests are [changed or added](https://github.com/aws-amplify/amplify-codegen/blob/master/CONTRIBUTING.md#tests)
28+
- [ ] Tests are [changed or added](https://github.com/aws-amplify/amplify-codegen/blob/main/CONTRIBUTING.md#tests)
2929
- [ ] Relevant documentation is changed or added (and PR referenced)
3030
- [ ] Breaking changes to existing customers are released behind a feature flag or major version update
3131
- [ ] Changes are tested using sample applications for all relevant platforms (iOS/android/flutter/Javascript) that use the feature added/modified

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Pull requests are welcome!
7474

7575
You should open an issue to discuss your pull request, unless it's a trivial change. It's best to ensure that your proposed change would be accepted so that you don't waste your own time. If you would like to implement support for a significant feature that is not yet available, please talk to us beforehand to avoid any duplication of effort.
7676

77-
Pull requests should generally be opened against **master**.
77+
Pull requests should generally be opened against **main**.
7878

7979
Don't include any build files i.e. `dist/`, `lib/`. These will be built upon publish to npm and when a release is created on GitHub.
8080

‎Readme.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<img src="https://img.shields.io/discord/308323056592486420?logo=discord"" alt="Discord Chat" />
88
</a>
99
<a href="https://circleci.com/gh/aws-amplify/amplify-codegen">
10-
<img src="https://img.shields.io/circleci/project/github/aws-amplify/amplify-codegen/master.svg" alt="build:started">
10+
<img src="https://img.shields.io/circleci/project/github/aws-amplify/amplify-codegen/main.svg" alt="build:started">
1111
</a>
1212
</p>
1313

@@ -53,4 +53,4 @@ Errors sometimes occur when a different version of `amplify-cli-core` is install
5353

5454
## Contributing
5555

56-
See the contribution guideline. https://github.com/aws-amplify/amplify-codegen/blob/master/CONTRIBUTING.md
56+
See the contribution guideline. https://github.com/aws-amplify/amplify-codegen/blob/main/CONTRIBUTING.md

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
"version": "0.1.0",
44
"description": "amplify-codegen",
55
"scripts": {
6-
"test-changed": "lerna run test --since master",
6+
"test-changed": "lerna run test --since main",
77
"test": "lerna run test",
88
"test-ci": "lerna run test --concurrency 1 -- --ci -i",
99
"lint": "eslint . --ext .js,.jsx,.ts,.tsx --quiet",
1010
"lint-fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
1111
"clean": "lerna run clean && lerna exec yarn rimraf tsconfig.tsbuildinfo && lerna clean --yes && yarn rimraf node_modules",
1212
"build": "lerna run build",
1313
"production-build": "yarn --ignore-engines && lerna run build --concurrency 3 --stream",
14-
"publish:master": "lerna publish --canary --exact --force-publish --preid=dev --dist-tag=dev --include-merged-tags --conventional-prerelease --no-verify-access --yes",
14+
"publish:main": "lerna publish --canary --exact --force-publish --preid=dev --dist-tag=dev --include-merged-tags --conventional-prerelease --no-verify-access --yes",
1515
"publish:release": "lerna publish --exact --conventional-commits --message 'chore(release): Publish [ci skip]' --no-verify-access --yes",
1616
"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",
17-
"postpublish:release": "git fetch . release:master && git push origin master",
17+
"postpublish:release": "git fetch . release:main && git push origin main",
1818
"yarn-use-bash": "yarn config set script-shell /bin/bash",
1919
"verdaccio-start": "yarn yarn-use-bash && source .circleci/local_publish_helpers.sh && startLocalRegistry \"$(pwd)/.circleci/verdaccio.yaml\"",
2020
"verdaccio-clean": "rimraf ../verdaccio-cache",

0 commit comments

Comments
 (0)