Skip to content

Commit f005135

Browse files
committed
Rename master to main
1 parent 912c04a commit f005135

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "CodeQL"
22

33
on:
44
push:
5-
branches: [develop, gh-pages, master]
5+
branches: [develop, gh-pages, main]
66
pull_request:
77
# The branches below must be a subset of the branches above
88
branches: [develop]
@@ -42,7 +42,7 @@ jobs:
4242
with:
4343
languages: ${{ matrix.language }}
4444
# If you wish to specify custom queries, you can do so here or in a config file.
45-
# By default, queries listed here will override any specified in a config file.
45+
# By default, queries listed here will override any specified in a config file.
4646
# Prefix the list here with "+" to use these queries and those in the config file.
4747
# queries: ./path/to/local/query, your-org/your-repo/queries@main
4848

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
- TAG=$(echo $TRAVIS_TAG | sed 's/^.*-\([a-z]*\).*$/\1/')
5757
# set to `latest` in case of no suffix
5858
- TAG=$([ "${TAG}" = "$TRAVIS_TAG" ] && echo "latest" || echo $TAG)
59-
# make sure `latest` tag is create from master branch
60-
- '[ "$TAG" = "latest" ] && [ $(git rev-parse HEAD) != $(git rev-parse origin/master) ] && return 1 || return 0'
59+
# make sure `latest` tag is create from main branch
60+
- '[ "$TAG" = "latest" ] && [ $(git rev-parse HEAD) != $(git rev-parse origin/main) ] && return 1 || return 0'
6161
- set +e
6262
deploy:
6363
edge: true # opt in to dpl v2
@@ -67,9 +67,9 @@ jobs:
6767
tags: true
6868
all_branches: true
6969

70-
# update gh-pages docs on master
70+
# update gh-pages docs on main
7171
- stage: Publish Docs
72-
if: branch = master
72+
if: branch = main
7373
script: npm run build-docs
7474
before_deploy: openssl aes-256-cbc -K $encrypted_05f822b6caa8_key -iv $encrypted_05f822b6caa8_iv
7575
-in .github/travis-deploy-key.enc -out /tmp/travis-deploy-key -d
@@ -81,7 +81,7 @@ jobs:
8181
deploy_key: /tmp/travis-deploy-key
8282
commit_message: Deploy to %{target_branch}
8383
on:
84-
branch: master
84+
branch: main
8585

8686
before_install:
8787
- '[[ "$CREATE_RELEASE" == "true" || "$TRAVIS_BRANCH" == "main" ]] && true || unset encrypted_05f822b6caa8_key'

npm/create-release.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ if (preReleaseSuffix && preReleaseSuffix !== 'beta') {
1616

1717
// 🚢 Just Ship It!
1818
shipit({
19+
mainBranch: 'main',
1920
// don't push to origin unless explicitly set
2021
pushToOrigin: pushToOrigin === 'true',
2122
// prerelease suffix, if any

0 commit comments

Comments
 (0)