From 9a8b81d1257ab6f06f31def92ad4ffa666b566ab Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 26 Mar 2020 19:24:31 +0100 Subject: [PATCH] Remove debug log --- prepare.sh | 4 ---- run.sh | 8 ++++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/prepare.sh b/prepare.sh index d727e38..15edded 100755 --- a/prepare.sh +++ b/prepare.sh @@ -10,8 +10,6 @@ set -eo pipefail trap "exit $SYSTEM_FAILURE_EXIT_CODE" ERR start_container () { - set -x - if lxc info "$CONTAINER_ID" >/dev/null 2>/dev/null ; then echo 'Found old container, deleting' lxc delete -f "$CONTAINER_ID" @@ -31,8 +29,6 @@ start_container () { chmod 777 $current_dir/cache lxc config device add "$CONTAINER_ID" cache-folder disk path=/cache source="$current_dir/cache" - set +x - wait_container $CONTAINER_ID } diff --git a/run.sh b/run.sh index 3284d5a..99ce6d9 100755 --- a/run.sh +++ b/run.sh @@ -13,6 +13,8 @@ create_sym_link() { } link_moulinette_from_git() { + echo "Moulinette: using the $CURRENT_BRANCH branch if it exists, $DEFAULT_BRANCH otherwise" + moulinette_dir="/tmp/ci_moulinette" lxc exec "$CONTAINER_ID" -- sh -c "mkdir $moulinette_dir" lxc exec "$CONTAINER_ID" -- sh -c "git clone https://github.com/YunoHost/moulinette $moulinette_dir" @@ -29,6 +31,8 @@ link_moulinette_from_git() { } link_ssowat_from_git() { + echo "SSOWAT: using the $CURRENT_BRANCH branch if it exists, $DEFAULT_BRANCH otherwise" + ssowat_dir="/tmp/ci_ssowat" lxc exec "$CONTAINER_ID" -- sh -c "mkdir $ssowat_dir" lxc exec "$CONTAINER_ID" -- sh -c "git clone https://github.com/YunoHost/ssowat $ssowat_dir" @@ -55,7 +59,8 @@ case ${2} in build_script) case $PROJECT_NAME in yunohost) - set -x + echo "Link yunohost" + # bin create_sym_link "$PROJECT_DIR/bin/yunohost" "/usr/bin/yunohost" create_sym_link "$PROJECT_DIR/bin/yunohost-api" "/usr/bin/yunohost-api" @@ -88,7 +93,6 @@ case ${2} in # ssowat link_ssowat_from_git - set +x ;; esac ;;