File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ before_deploy:
10
10
- cat .release-notes/template.md | envsubst > .release-notes/tmp-notes-${TRAVIS_TAG}.md
11
11
12
12
# 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
14
14
deploy :
15
15
- provider : pages
16
16
local-dir : ./docs/
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ REPOSITORY_URL = $(REPOSITORY_BASE_URL)/tree/$(TRAVIS_TAG)
12
12
PRESENTATION_URL = https://$(REPOSITORY_OWNER ) .github.io/$(REPOSITORY_NAME ) /$(TRAVIS_TAG )
13
13
else
14
14
ifdef TRAVIS_BRANCH
15
- ifneq ($(TRAVIS_BRANCH ) , master )
15
+ ifneq ($(TRAVIS_BRANCH ) , main )
16
16
REPOSITORY_URL = $(REPOSITORY_BASE_URL ) /tree/$(TRAVIS_BRANCH )
17
17
PRESENTATION_URL = https://$(REPOSITORY_OWNER ) .github.io/$(REPOSITORY_NAME ) /$(TRAVIS_BRANCH )
18
18
endif
Original file line number Diff line number Diff line change 21
21
fi
22
22
23
23
# 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
26
26
set +u
27
27
if [ -n " ${TRAVIS_TAG} " ]; then
28
28
echo " == Using tag ${TRAVIS_TAG} "
29
29
DEPLOY_DIR=" ${DOCS_DIR} /${TRAVIS_TAG} "
30
30
# Generate QRCode and overwrite the default one
31
31
make qrcode
32
- elif [ -n " ${TRAVIS_BRANCH} " ] && [ " ${TRAVIS_BRANCH} " != " master " ]; then
32
+ elif [ -n " ${TRAVIS_BRANCH} " ] && [ " ${TRAVIS_BRANCH} " != " main " ]; then
33
33
echo " == Using branch ${TRAVIS_BRANCH} "
34
34
DEPLOY_DIR=" ${DOCS_DIR} /${TRAVIS_BRANCH} "
35
35
# Generate QRCode and overwrite the default one
You can’t perform that action at this time.
0 commit comments