Merge pull request #6962 from obrakmann/split_wiki_docs

Wiki: keep separate Trait and Lua API docs for release and playtest

.travis.yml

@@ -22,7 +22,7 @@ script:
 
 # Automatically update the trait documentation and Lua API
 after_success:
- - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && make docs && cd packaging && ./update-wiki.sh
+ - test $TRAVIS_PULL_REQUEST == "false" && make docs && cd packaging && ./update-wiki.sh $TRAVIS_BRANCH
 
 # Only watch the development branch and tagged release.
 branches:

packaging/update-wiki.sh

@@ -1,17 +1,33 @@
 #!/bin/bash
 
+case "$1" in
+	"bleed")
+		exit
+		;;
+	"next")
+		TAG=" (playtest)"
+		;;
+	"master")
+		TAG=""
+		;;
+	*)
+		#Eh? Unknown branch
+		exit
+		;;
+esac
+
 git config --global user.email "orabot@users.noreply.github.com"
 git config --global user.name "orabot"
 
 echo "Updating https://github.com/OpenRA/OpenRA/wiki/"
 rm -rf $HOME/openra-wiki
 git clone git@github.com:OpenRA/OpenRA.wiki.git $HOME/openra-wiki
-cp -fr ../DOCUMENTATION.md $HOME/openra-wiki/Traits.md
-cp -fr ../Lua-API.md $HOME/openra-wiki/Lua-API.md
+cp -fr ../DOCUMENTATION.md "${HOME}/openra-wiki/Traits${TAG}.md"
+cp -fr ../Lua-API.md "${HOME}/openra-wiki/Lua API${TAG}.md"
 
 pushd $HOME/openra-wiki
-git add Traits.md
-git add Lua-API.md
-git commit -m "Update trait and scripting documentation"
+git add "Traits${TAG}.md"
+git add "Lua API${TAG}.md"
+git commit -m "Update trait and scripting documentation for branch $1"
 git push origin master
-popd
+popd