Skip to content

Commit

Permalink
feat: change default branch to "main" (projen#517)
Browse files Browse the repository at this point in the history
Change the default branch from `master` to `main`.

BREAKING CHANGE: Projects created with `projen` will now default to using the `main` branch.
  • Loading branch information
campionfellin authored Feb 3, 2021
1 parent e74ee65 commit df74bc9
Show file tree
Hide file tree
Showing 9 changed files with 169 additions and 169 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Release
on:
push:
branches:
- master
- main
workflow_dispatch: {}
jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions .projen/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@
"release": {
"name": "release",
"category": "20.release",
"description": "Bumps version & push to master",
"description": "Bumps version & push to main",
"steps": [
{
"spawn": "bump"
},
{
"exec": "git push --follow-tags origin master"
"exec": "git push --follow-tags origin main"
}
],
"condition": "! git log --oneline -1 | grep -q \"chore(release):\""
Expand Down
164 changes: 82 additions & 82 deletions API.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/awscdk-construct.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ Two workflows will be created as Github Actions:

* The Build workflow - controlled by the `buildWorkflow` field. On a 'pull_request' or 'workflow_dispatch' the library
will be built and checked for anti-tamper (ensure no manual changes to generated files).
* The Release workflow - controlled by the `releaseWorkflow` field. On a push to `master` (overridden at
* The Release workflow - controlled by the `releaseWorkflow` field. On a push to `main` (overridden at
`props.defaultReleaseBranch`) the library is built, anti-tampered, version bumped with a commit, pushed back to git,
and then published to the configured artifact repositories (e.g. npm, pypi).

Expand Down
20 changes: 10 additions & 10 deletions src/__tests__/__snapshots__/integ.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ name: Release
on:
push:
branches:
- master
- main
workflow_dispatch: {}
jobs:
build:
Expand Down Expand Up @@ -984,14 +984,14 @@ UNEXPECTED BREAKING CHANGES: add keys such as 'removed:constructs.Node.of' to .c
"release": Object {
"category": "20.release",
"condition": "! git log --oneline -1 | grep -q \\"chore(release):\\"",
"description": "Bumps version & push to master",
"description": "Bumps version & push to main",
"name": "release",
"steps": Array [
Object {
"spawn": "bump",
},
Object {
"exec": "git push --follow-tags origin master",
"exec": "git push --follow-tags origin main",
},
],
},
Expand Down Expand Up @@ -2161,14 +2161,14 @@ UNEXPECTED BREAKING CHANGES: add keys such as 'removed:constructs.Node.of' to .c
"release": Object {
"category": "20.release",
"condition": "! git log --oneline -1 | grep -q \\"chore(release):\\"",
"description": "Bumps version & push to master",
"description": "Bumps version & push to main",
"name": "release",
"steps": Array [
Object {
"spawn": "bump",
},
Object {
"exec": "git push --follow-tags origin master",
"exec": "git push --follow-tags origin main",
},
],
},
Expand Down Expand Up @@ -3447,14 +3447,14 @@ junit.xml
"release": Object {
"category": "20.release",
"condition": "! git log --oneline -1 | grep -q \\"chore(release):\\"",
"description": "Bumps version & push to master",
"description": "Bumps version & push to main",
"name": "release",
"steps": Array [
Object {
"spawn": "bump",
},
Object {
"exec": "git push --follow-tags origin master",
"exec": "git push --follow-tags origin main",
},
],
},
Expand Down Expand Up @@ -4284,7 +4284,7 @@ name: Release
on:
push:
branches:
- master
- main
workflow_dispatch: {}
jobs:
build:
Expand Down Expand Up @@ -4515,14 +4515,14 @@ junit.xml
"release": Object {
"category": "20.release",
"condition": "! git log --oneline -1 | grep -q \\"chore(release):\\"",
"description": "Bumps version & push to master",
"description": "Bumps version & push to main",
"name": "release",
"steps": Array [
Object {
"spawn": "bump",
},
Object {
"exec": "git push --follow-tags origin master",
"exec": "git push --follow-tags origin main",
},
],
},
Expand Down
Loading

0 comments on commit df74bc9

Please sign in to comment.