summaryrefslogtreecommitdiff
path: root/tools/ci
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-01-25 02:58:21 +0300
committerAndrei Karas <akaras@inbox.ru>2017-01-25 02:58:21 +0300
commit166fdffd04277c5f29f57ace70a16d34e49c7bb0 (patch)
treeca3d9550f7e26736da79a32f5910cc16d09840aa /tools/ci
parent591c4ab7e78da61afddda8a76195212b748a9554 (diff)
downloadplus-166fdffd04277c5f29f57ace70a16d34e49c7bb0.tar.gz
plus-166fdffd04277c5f29f57ace70a16d34e49c7bb0.tar.bz2
plus-166fdffd04277c5f29f57ace70a16d34e49c7bb0.tar.xz
plus-166fdffd04277c5f29f57ace70a16d34e49c7bb0.zip
Move some always executed ci commands from init.sh into before_script.
Diffstat (limited to 'tools/ci')
-rwxr-xr-xtools/ci/scripts/init.sh14
1 files changed, 5 insertions, 9 deletions
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