Skip to content

Commit dee54cb

Browse files
committed
fix: revise some remaining issues regarding master docs deploy from #656.
This is a squashed commit including #657, #658 and a bunch of following commits until the problem was resolved. cc @effigies @mgxd - please fix your repos' histories if they were updated with commits after #656.
1 parent ac579e7 commit dee54cb

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.github/workflows/docs-build-update.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,17 @@ jobs:
6868
git push
6969
7070
- name: Push "master" docs to gh-pages after a PR is merged
71-
if: github.event.pull_request.merged == true
71+
if: github.ref == 'refs/heads/master'
7272
run: |
7373
if [[ "${CURBRANCH}" != "master" ]]; then
7474
echo "$CURBRANCH is not the default development branch"
7575
exit 1
7676
fi
7777
git checkout -b gh-pages origin/gh-pages
78-
git rm -r master/
78+
git rm -r master/ || true
7979
# It is fundamental that the directory does not exist at all.
8080
rm -rf master
8181
cp -r $HOME/docs/$CURBRANCH $PWD/master
82+
git add master
8283
git commit -am "docs(master): Update docs of development line" || true
8384
git push

0 commit comments

Comments
 (0)