From eb27c9ef9dc10bbabfd4a20a22fdf118eb642ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 16 Jun 2014 09:29:17 +0200 Subject: [PATCH 1/3] run ./update-wiki.sh again after release deployment closes #5643 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index dc538b72ae..89187a2a8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,7 @@ before_deploy: - cd packaging - mkdir build - ./package-all.sh ${TRAVIS_TAG} ${PWD}/build/ + - ./update-wiki.sh deploy: provider: releases api_key: From 6928a828e865ea208f1f3ee487ca31ed8073151b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 16 Jun 2014 09:34:17 +0200 Subject: [PATCH 2/3] pushd and popd is safer here to not confuse Travis --- packaging/update-wiki.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packaging/update-wiki.sh b/packaging/update-wiki.sh index f593360a15..338aa51a66 100755 --- a/packaging/update-wiki.sh +++ b/packaging/update-wiki.sh @@ -8,8 +8,9 @@ pushd .. &> /dev/null mono --debug OpenRA.Utility.exe --lua-docs d2k > packaging/openra-wiki/New-Lua-API.md popd &> /dev/null -cd openra-wiki +pushd openra-wiki git add Traits.md git add New-Lua-API.md git commit -m "Update trait and scripting documentation" -git push origin master \ No newline at end of file +git push origin master +popd \ No newline at end of file From 521ca70254c7df3ddece0f5415f5f15995ab8c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 16 Jun 2014 10:30:14 +0200 Subject: [PATCH 3/3] set the git user and email to avoid problems --- packaging/update-wiki.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packaging/update-wiki.sh b/packaging/update-wiki.sh index 338aa51a66..2c281f2d1e 100755 --- a/packaging/update-wiki.sh +++ b/packaging/update-wiki.sh @@ -1,3 +1,6 @@ +git config --global user.email "travis@travis-ci.org" +git config --global user.name "travis-ci" + echo "Updating https://github.com/OpenRA/OpenRA/wiki/Traits" rm -rf openra-wiki git clone git@github.com:OpenRA/OpenRA.wiki.git openra-wiki