Skip to content

Commit 3edacb0

Browse files
authored
Update publish-to-website.yml
1 parent b13ca08 commit 3edacb0

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/publish-to-website.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ env:
66
on:
77
push:
88
branches:
9-
- master
9+
- main
1010
paths:
1111
- .github/workflows/publish-to-website.yml
1212
- config/urls.yaml
@@ -36,7 +36,7 @@ jobs:
3636
working-directory: innersourcecommons.org
3737
run: |
3838
git checkout --track origin/$BRANCH_NAME || git checkout -b $BRANCH_NAME
39-
git merge -X theirs origin/master --no-edit
39+
git merge -X theirs origin/main --no-edit
4040
- uses: actions/setup-node@v1
4141
with:
4242
node-version: 12
@@ -53,4 +53,4 @@ jobs:
5353
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
5454
git add .
5555
git commit -m "Update Learning Path articles"
56-
git push origin $BRANCH_NAME
56+
git push origin $BRANCH_NAME

0 commit comments

Comments
 (0)