Skip to content
This repository was archived by the owner on Apr 7, 2025. It is now read-only.

Commit cf02529

Browse files
committed
fix: workflows should pull/push to develop branch
1 parent dca6fd0 commit cf02529

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/docs.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ jobs:
9292
git config user.name "${{ env.THIRD_PARTY_GIT_AUTHOR_NAME }}"
9393
git config user.email "${{ env.THIRD_PARTY_GIT_AUTHOR_EMAIL }}"
9494
95-
# master could have been modified, so pull before pushing
96-
git pull --ff-only origin master
95+
# develop could have been modified by the time we get here, so pull before pushing
96+
git pull --ff-only origin develop
9797
9898
git add .
9999
git commit -m "$WIKI_COMMIT_MESSAGE"
100-
git push origin master
100+
git push origin develop
101101
)
102102
else
103103
warning "No file diff between wiki and docs. Exiting."

.github/workflows/project-stats.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ jobs:
3232
git config --local user.email "${{ env.THIRD_PARTY_GIT_AUTHOR_EMAIL }}"
3333
git config --local user.name "${{ env.THIRD_PARTY_GIT_AUTHOR_NAME }}"
3434
35+
# develop could have been modified since we checked out, so pull before pushing
36+
git pull --ff-only origin develop
37+
3538
echo "Updated project data files -- committing"
3639
git add src/data
3740
git commit -m "chore(stats): updated project stats files"
@@ -85,7 +88,7 @@ jobs:
8588
elif [ '${{ github.ref }}' = 'refs/heads/master' ]; then
8689
npm run build:production
8790
else
88-
echo "::error::Pull Request opened on unsupported branch. Exiting."
91+
echo "::error::Running on unsupported branch. Exiting."
8992
exit 1
9093
fi
9194

0 commit comments

Comments
 (0)