File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -2,10 +2,10 @@ name: Build
2
2
on :
3
3
pull_request :
4
4
branches :
5
- - master
5
+ - main
6
6
push :
7
7
branches :
8
- - master
8
+ - main
9
9
jobs :
10
10
build :
11
11
name : Build
@@ -34,13 +34,13 @@ jobs:
34
34
mkdir output
35
35
bash ci-build/docker-run.sh "$GITHUB_WORKSPACE/html" output
36
36
- name : Docker login
37
- if : ${{ github.event_name == 'push' && github.ref == 'refs/heads/master ' }}
37
+ if : ${{ github.event_name == 'push' && github.ref == 'refs/heads/main ' }}
38
38
uses : docker/login-action@v1
39
39
with :
40
40
username : ${{ secrets.DOCKER_HUB_USERNAME }}
41
41
password : ${{ secrets.DOCKER_HUB_TOKEN }}
42
42
- name : Docker push
43
- if : ${{ github.event_name == 'push' && github.ref == 'refs/heads/master ' }}
43
+ if : ${{ github.event_name == 'push' && github.ref == 'refs/heads/main ' }}
44
44
run : |
45
45
docker tag "$IMAGE_NAME" "$IMAGE_NAME:$GITHUB_SHA"
46
46
docker tag "$IMAGE_NAME" "$IMAGE_NAME:latest"
Original file line number Diff line number Diff line change @@ -191,7 +191,7 @@ function checkHTMLBuildIsUpToDate {
191
191
fi
192
192
# TODO: `git remote get-url origin` is nicer, but new in Git 2.7.
193
193
ORIGIN_URL=$( git config --get remote.origin.url)
194
- GIT_FETCH_ARGS+=( " $ORIGIN_URL " master )
194
+ GIT_FETCH_ARGS+=( " $ORIGIN_URL " main )
195
195
git fetch " ${GIT_FETCH_ARGS[@]} "
196
196
NEW_COMMITS=$( git rev-list --count HEAD..FETCH_HEAD)
197
197
if [[ $NEW_COMMITS != " 0" ]]; then
@@ -203,7 +203,7 @@ function checkHTMLBuildIsUpToDate {
203
203
echo
204
204
echo " To update, run this command:"
205
205
echo
206
- echo " git pull --rebase origin master "
206
+ echo " git pull --rebase origin main "
207
207
echo
208
208
echo " This check can be bypassed with the --no-update option."
209
209
exit 1
You can’t perform that action at this time.
0 commit comments