Skip to content

Commit d8535b9

Browse files
committed
Rename master branch to main
Signed-off-by: dduportal <1522731+dduportal@users.noreply.github.com>
1 parent fdd7bee commit d8535b9

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ before_deploy:
1010
- cat .release-notes/template.md | envsubst > .release-notes/tmp-notes-${TRAVIS_TAG}.md
1111

1212
# From https://github.com/travis-ci/travis-ci/issues/7780#issuecomment-302389370
13-
# we have to duplicate to meet tags and master
13+
# we have to duplicate to meet tags and main
1414
deploy:
1515
- provider: pages
1616
local-dir: ./docs/

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ REPOSITORY_URL = $(REPOSITORY_BASE_URL)/tree/$(TRAVIS_TAG)
1212
PRESENTATION_URL = https://$(REPOSITORY_OWNER).github.io/$(REPOSITORY_NAME)/$(TRAVIS_TAG)
1313
else
1414
ifdef TRAVIS_BRANCH
15-
ifneq ($(TRAVIS_BRANCH), master)
15+
ifneq ($(TRAVIS_BRANCH), main)
1616
REPOSITORY_URL = $(REPOSITORY_BASE_URL)/tree/$(TRAVIS_BRANCH)
1717
PRESENTATION_URL = https://$(REPOSITORY_OWNER).github.io/$(REPOSITORY_NAME)/$(TRAVIS_BRANCH)
1818
endif

scripts/travis-gh-deploy.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ else
2121
fi
2222

2323
# If a tag triggered the deploy, we deploy to a folder having the tag name
24-
# Same if it is a branch different of "gh-pages" or "master"
25-
# otherwise we are on master and we deploy into latest
24+
# Same if it is a branch different of "gh-pages" or "main"
25+
# otherwise we are on main and we deploy into latest
2626
set +u
2727
if [ -n "${TRAVIS_TAG}" ]; then
2828
echo "== Using tag ${TRAVIS_TAG}"
2929
DEPLOY_DIR="${DOCS_DIR}/${TRAVIS_TAG}"
3030
# Generate QRCode and overwrite the default one
3131
make qrcode
32-
elif [ -n "${TRAVIS_BRANCH}" ] && [ "${TRAVIS_BRANCH}" != "master" ]; then
32+
elif [ -n "${TRAVIS_BRANCH}" ] && [ "${TRAVIS_BRANCH}" != "main" ]; then
3333
echo "== Using branch ${TRAVIS_BRANCH}"
3434
DEPLOY_DIR="${DOCS_DIR}/${TRAVIS_BRANCH}"
3535
# Generate QRCode and overwrite the default one

0 commit comments

Comments
 (0)