This repository was archived by the owner on Apr 7, 2025. It is now read-only.
File tree 2 files changed +7
-4
lines changed
2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -92,12 +92,12 @@ jobs:
92
92
git config user.name "${{ env.THIRD_PARTY_GIT_AUTHOR_NAME }}"
93
93
git config user.email "${{ env.THIRD_PARTY_GIT_AUTHOR_EMAIL }}"
94
94
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
97
97
98
98
git add .
99
99
git commit -m "$WIKI_COMMIT_MESSAGE"
100
- git push origin master
100
+ git push origin develop
101
101
)
102
102
else
103
103
warning "No file diff between wiki and docs. Exiting."
Original file line number Diff line number Diff line change 32
32
git config --local user.email "${{ env.THIRD_PARTY_GIT_AUTHOR_EMAIL }}"
33
33
git config --local user.name "${{ env.THIRD_PARTY_GIT_AUTHOR_NAME }}"
34
34
35
+ # develop could have been modified since we checked out, so pull before pushing
36
+ git pull --ff-only origin develop
37
+
35
38
echo "Updated project data files -- committing"
36
39
git add src/data
37
40
git commit -m "chore(stats): updated project stats files"
85
88
elif [ '${{ github.ref }}' = 'refs/heads/master' ]; then
86
89
npm run build:production
87
90
else
88
- echo "::error::Pull Request opened on unsupported branch. Exiting."
91
+ echo "::error::Running on unsupported branch. Exiting."
89
92
exit 1
90
93
fi
91
94
You can’t perform that action at this time.
0 commit comments