diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-01-25 02:58:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-01-25 02:58:21 +0300 |
| commit | 166fdffd04277c5f29f57ace70a16d34e49c7bb0 (patch) | |
| tree | ca3d9550f7e26736da79a32f5910cc16d09840aa | |
| parent | 591c4ab7e78da61afddda8a76195212b748a9554 (diff) | |
| download | manaplus-166fdffd04277c5f29f57ace70a16d34e49c7bb0.tar.gz manaplus-166fdffd04277c5f29f57ace70a16d34e49c7bb0.tar.bz2 manaplus-166fdffd04277c5f29f57ace70a16d34e49c7bb0.tar.xz manaplus-166fdffd04277c5f29f57ace70a16d34e49c7bb0.zip | |
Move some always executed ci commands from init.sh into before_script.
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rwxr-xr-x | tools/ci/scripts/init.sh | 14 |
2 files changed, 8 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 215b184ae..93564c9c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,9 @@ stages: before_script: - uname -a + - cat /etc/os-release + - pwd + - mkdir logs variables: GET_SOURCES_ATTEMPTS: "5" diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh index 2ee34d722..5ab131b1c 100755 --- a/tools/ci/scripts/init.sh +++ b/tools/ci/scripts/init.sh @@ -1,13 +1,8 @@ #!/bin/bash -pwd -mkdir logs - export dir=$(pwd) export ERRFILE=${dir}/logs/${LOGFILE} -cat /etc/os-release - rm ${ERRFILE} function do_init { @@ -65,9 +60,13 @@ function aptget_update { function aptget_install { if [ "$RUNFROMSHELL" != "" ]; then - echo "Running from shell. Skipping apt-get install" + echo "Running from shell. Skipping apt-get" return fi + + update_repos + aptget_update + echo "apt-get -y -qq install $*" apt-get -y -qq install $* if [ "$?" != 0 ]; then @@ -265,6 +264,3 @@ function run_mplint { check_error $? run_check_warnings } - -update_repos -aptget_update |