Skip to content

Commit

Permalink
chore(rename): main
Browse files Browse the repository at this point in the history
  • Loading branch information
nellyk authored Sep 2, 2020
2 parents 51ded8b + f3ef0e9 commit f82b306
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:

steps:
- uses: actions/checkout@v2
# Create a master branch for commitlint
# Create a main branch for commitlint
# https://github.com/conventional-changelog/commitlint/issues/6
- run: git remote set-branches origin master && git fetch
- run: git remote set-branches origin main && git fetch
- uses: actions/setup-node@v1
with:
node-version: '12.x'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release
on:
push:
branches:
- master
- main
jobs:
release_package:
runs-on: ubuntu-latest
Expand Down
17 changes: 15 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"test:integration": "cross-env NODE_ENV=production jest --config jest.integration.config.js || (npm run demo:test-down && exit 1)",
"pretest:integration": "npm run demo:test-up",
"posttest:integration": "npm run demo:test-down",
"lint:commits": "commitlint --from origin/master --to HEAD",
"lint:commits": "commitlint --from origin/main --to HEAD",
"lint:lockfile": "lockfile-lint --path yarn.lock --allowed-hosts registry.yarnpkg.com --validate-https",
"lint:eslint": "eslint . --ext js,jsx,md,snap",
"lint": "npm run lint:eslint && npm run lint:lockfile && npm run lint:commits",
Expand Down Expand Up @@ -115,7 +115,20 @@
"@semantic-release/git",
"@semantic-release/github"
],
"branch": "master"
"branches": [
"+([0-9])?(.{+([0-9]),x}).x",
"main",
"next",
"next-major",
{
"name": "beta",
"prerelease": true
},
{
"name": "alpha",
"prerelease": true
}
]
},
"husky": {
"hooks": {
Expand Down

0 comments on commit f82b306

Please sign in to comment.