Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update doc-deploy file

Browse source
This commit is contained in:
Griatch 2020-06-13 12:35:06 +02:00
parent 2230900c55
commit 058ff22604
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/Makefile
View file

@ -31,7 +31,8 @@ help:
@echo " $(cblue)clean$(cnorm) to remove remnants of a previous build" @echo " $(cblue)clean$(cnorm) to remove remnants of a previous build"
@echo " $(cblue)local$(cnorm) to build local html docs of the current branch (no multiversion)." @echo " $(cblue)local$(cnorm) to build local html docs of the current branch (no multiversion)."
@echo " $(cblue)mv-local$(cnorm) to build multiversion html docs, without deploying (req. local git commit)" @echo " $(cblue)mv-local$(cnorm) to build multiversion html docs, without deploying (req. local git commit)"
@echo " $(cblue)release$(cnorm) to build and deploy multiversion docs online (req. commit and github push access)" @echo " $(cblue)deploy$(cnorm) to deploy previously built multiversion docs online (req. commit and github push access)"
@echo " $(cblue)release$(cnorm) to build + deploy multiversion docs online (req. commit and github push access)"
.PHONY: help Makefile .PHONY: help Makefile
@ -115,6 +116,6 @@ deploy:
# build and prepare the docs for release # build and prepare the docs for release
release: release:
make mv-local make mv-local
# make _mv-deploy make deploy
@echo "" @echo ""
@echo "Deployment complete." @echo "Deployment complete."

13
docs/deploy.sh
View file

@ -18,20 +18,17 @@ git checkout gh-pages
# remove all but the build dir # remove all but the build dir
ls -Q | grep -v build | xargs rm -Rf ls -Q | grep -v build | xargs rm -Rf
cp -Rf build/html/versions/* . cp -Rf build/html/* .
# docs/build is in .gitignore so will not be included
git add .
# TODO automate this? # TODO automate this?
ln -s 1.0-dev latest ln -s 1.0-dev latest
git add docs/* # docs/build is in .gitignore so will not be included
git add .
git commit -a -m "Updated HTML docs" git commit -a -m "Updated HTML docs"
mv build docs/
echo "Skipping deployment" echo "Skipping deployment"
# git push origin gh-pages git push origin gh-pages
# get back to previous branch # get back to previous branch
git checkout - git checkout -