Skip to content

Commit eeeeae3

Browse files
committed
Default branch rename
Helps with whatwg/meta#174.
1 parent 9c7441d commit eeeeae3

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Build
22
on:
33
pull_request:
44
branches:
5-
- master
5+
- main
66
push:
77
branches:
8-
- master
8+
- main
99
jobs:
1010
build:
1111
name: Build
@@ -34,13 +34,13 @@ jobs:
3434
mkdir output
3535
bash ci-build/docker-run.sh "$GITHUB_WORKSPACE/html" output
3636
- 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' }}
3838
uses: docker/login-action@v1
3939
with:
4040
username: ${{ secrets.DOCKER_HUB_USERNAME }}
4141
password: ${{ secrets.DOCKER_HUB_TOKEN }}
4242
- 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' }}
4444
run: |
4545
docker tag "$IMAGE_NAME" "$IMAGE_NAME:$GITHUB_SHA"
4646
docker tag "$IMAGE_NAME" "$IMAGE_NAME:latest"

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ function checkHTMLBuildIsUpToDate {
191191
fi
192192
# TODO: `git remote get-url origin` is nicer, but new in Git 2.7.
193193
ORIGIN_URL=$(git config --get remote.origin.url)
194-
GIT_FETCH_ARGS+=( "$ORIGIN_URL" master)
194+
GIT_FETCH_ARGS+=( "$ORIGIN_URL" main)
195195
git fetch "${GIT_FETCH_ARGS[@]}"
196196
NEW_COMMITS=$(git rev-list --count HEAD..FETCH_HEAD)
197197
if [[ $NEW_COMMITS != "0" ]]; then
@@ -203,7 +203,7 @@ function checkHTMLBuildIsUpToDate {
203203
echo
204204
echo "To update, run this command:"
205205
echo
206-
echo " git pull --rebase origin master"
206+
echo " git pull --rebase origin main"
207207
echo
208208
echo "This check can be bypassed with the --no-update option."
209209
exit 1

0 commit comments

Comments
 (0)