Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2020-06-13 10:45:46 +02:00
commit 23569645a9
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
docs/deploy.sh
View file

@ -12,13 +12,15 @@ 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
mv build ..
# the docs/ folder is named the same in both branches so we need to step out of
# it to not confuse what's what.
cd ..
rm -Rf docs/*
cp -Rf build/html/versions/* docs/
# remove all but the build dir
ls -Q | grep -v build | xargs rm -Rf
mv build/html/versions/* .
# docs/build is in .gitignore so will not be included
git add .
# TODO automate this?
ln -s 1.0-dev docs/latest