diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-04-08 23:16:09 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-04-08 23:16:09 +0300 |
commit | 5d8e1a54f175d519be170ce7485f24bc04a13ec6 (patch) | |
tree | 593cda4321b2f38f168f257f8871e42fa7ca5f35 /gitlab-ci | |
parent | daa76b7be74cfcf902c83d144b552696cc9b6a6b (diff) | |
download | evol-tools-5d8e1a54f175d519be170ce7485f24bc04a13ec6.tar.gz evol-tools-5d8e1a54f175d519be170ce7485f24bc04a13ec6.tar.bz2 evol-tools-5d8e1a54f175d519be170ce7485f24bc04a13ec6.tar.xz evol-tools-5d8e1a54f175d519be170ce7485f24bc04a13ec6.zip |
gitlab-ci: replace path .shared into shared.
Diffstat (limited to 'gitlab-ci')
-rwxr-xr-x | gitlab-ci/clientdata.sh | 16 | ||||
-rwxr-xr-x | gitlab-ci/failaction.sh | 10 | ||||
-rwxr-xr-x | gitlab-ci/susseccaction.sh | 10 |
3 files changed, 18 insertions, 18 deletions
diff --git a/gitlab-ci/clientdata.sh b/gitlab-ci/clientdata.sh index 6b81dae..d92c241 100755 --- a/gitlab-ci/clientdata.sh +++ b/gitlab-ci/clientdata.sh @@ -3,9 +3,9 @@ cd clientdata rm -rf public mkdir public -mkdir .shared -echo >.shared/error.log -echo ${CI_BUILD_ID} >.shared/buildid.log +mkdir shared +echo >shared/error.log +echo ${CI_BUILD_ID} >shared/buildid.log cd .. ln -s clientdata client-data @@ -19,19 +19,19 @@ cd tools/testxml export RES=$(cat errors.txt) if [[ -n "${RES}" ]]; then echo "xml check failed" - echo "xml check failed" >../../clientdata/.shared/error.log - echo ${RES} >>../../clientdata/.shared/error.log + echo "xml check failed" >../../clientdata/shared/error.log + echo ${RES} >>../../clientdata/shared/error.log exit 0 fi -echo >../../clientdata/.shared/error.log -./testxml.py silent >../../clientdata/.shared/error.log +echo >../../clientdata/shared/error.log +./testxml.py silent >../../clientdata/shared/error.log if [ "$?" != 0 ]; then echo "test xml error" exit 0 fi -echo >../../clientdata/.shared/error.log +echo >../../clientdata/shared/error.log cd ../update ./createnew.sh diff --git a/gitlab-ci/failaction.sh b/gitlab-ci/failaction.sh index 5ee4335..0d68247 100755 --- a/gitlab-ci/failaction.sh +++ b/gitlab-ci/failaction.sh @@ -4,8 +4,8 @@ export path="bot" export server="irc.freenode.net" export channel="#evol-dev" export nick="evolbuildbot" -export buildid="$(cat clientdata/.shared/buildid.log)" -export error="$(cat clientdata/.shared/error.log)" +export buildid="$(cat clientdata/shared/buildid.log)" +export error="$(cat clientdata/shared/error.log)" export msg="Build failed. See https://gitlab.com/evol/clientdata/builds/${buildid}" @@ -22,12 +22,12 @@ sleep 10s echo ${msg} >${path}/${server}/${channel}/in if [[ -n "${error}" ]]; then sleep 2s - export LINK=$(pastebinit -b http://paste.ubuntu.com/ clientdata/.shared/error.log) + export LINK=$(pastebinit -b http://paste.ubuntu.com/ clientdata/shared/error.log) echo "Error log: ${LINK}" >${path}/${server}/${channel}/in fi sleep 3s -rm -rf clientdata/.shared/buildid.log -rm -rf clientdata/.shared/error.log +rm -rf clientdata/shared/buildid.log +rm -rf clientdata/shared/error.log killall ii diff --git a/gitlab-ci/susseccaction.sh b/gitlab-ci/susseccaction.sh index 957f65e..4af7f6d 100755 --- a/gitlab-ci/susseccaction.sh +++ b/gitlab-ci/susseccaction.sh @@ -4,8 +4,8 @@ export path="bot" export server="irc.freenode.net" export channel="#evol-dev" export nick="evolbuildbot" -export buildid="$(cat clientdata/.shared/buildid.log)" -export error="$(cat clientdata/.shared/error.log)" +export buildid="$(cat clientdata/shared/buildid.log)" +export error="$(cat clientdata/shared/error.log)" export msg1="Build success. See https://gitlab.com/evol/clientdata/builds/${buildid}" export msg2="Build failed. See https://gitlab.com/evol/clientdata/builds/${buildid}" @@ -23,7 +23,7 @@ sleep 10s if [[ -n "${error}" ]]; then echo ${msg2} >${path}/${server}/${channel}/in sleep 2s - export LINK=$(pastebinit -b http://paste.ubuntu.com/ clientdata/.shared/error.log) + export LINK=$(pastebinit -b http://paste.ubuntu.com/ clientdata/shared/error.log) echo "Error log: ${LINK}" >${path}/${server}/${channel}/in else echo ${msg1} >${path}/${server}/${channel}/in @@ -31,7 +31,7 @@ fi sleep 3s -rm -rf clientdata/.shared/buildid.log -rm -rf clientdata/.shared/error.log +rm -rf clientdata/shared/buildid.log +rm -rf clientdata/shared/error.log killall ii |