Skip to content

Commit a90a0dc

Browse files
author
Lindsay Holmwood
authored
Merge pull request #102 from section/make-default-branch-main
Be more inclusive by naming default branch "main"
2 parents 135e0bd + f923b90 commit a90a0dc

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Test
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ main ]
88

99
jobs:
1010

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ check_version:
4343
@if [ "$(shell echo $(VERSION) | cut -c 1)" != "v" ]; then echo "VERSION must be in the format v0.0.5"; exit 1 ; fi
4444

4545
release: check_version
46-
@if [ "$(shell git rev-parse --abbrev-ref HEAD)" != "master" ]; then echo "Must be on the 'master' branch"; exit 1 ; fi
46+
@if [ "$(shell git rev-parse --abbrev-ref HEAD)" != "main" ]; then echo "Must be on the 'main' branch"; exit 1 ; fi
4747
@git update-index --refresh
4848
@git diff-index --quiet HEAD --
4949
git tag -f -a $(VERSION) -m ''
50-
git push origin master
50+
git push origin main
5151
git push origin refs/tags/$(VERSION)

0 commit comments

Comments
 (0)