From 2230900c55c51254f141dee4dff517e9d660adbb Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 13 Jun 2020 10:51:17 +0200 Subject: [PATCH] Merge dev version of doc-deploy --- docs/deploy.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/deploy.sh b/docs/deploy.sh index ebb7e2aa2a..39f012c453 100644 --- a/docs/deploy.sh +++ b/docs/deploy.sh @@ -10,6 +10,7 @@ if [ -n "$(git status --untracked-files=no --porcelain)" ]; then exit 1 fi +# get the deployment branch git checkout gh-pages # at this point we should be inside the docs/ folder of the gh-pages branch, # with the build/ directory available since this is not in git @@ -17,15 +18,22 @@ git checkout gh-pages # remove all but the build dir ls -Q | grep -v build | xargs rm -Rf -mv build/html/versions/* . +cp -Rf build/html/versions/* . # docs/build is in .gitignore so will not be included git add . +# TODO automate this? +ln -s 1.0-dev latest + +git add docs/* git commit -a -m "Updated HTML docs" -git push origin gh-pages -# get back to previous branch +mv build docs/ +echo "Skipping deployment" +# git push origin gh-pages + +# get back to previous branch git checkout - echo "Deployed to https://evennia.github.io/evennia-docs."