diff --git a/base.sh b/base.sh index e42c923..20d880d 100755 --- a/base.sh +++ b/base.sh @@ -19,14 +19,15 @@ #CUSTOM_ENV_CI_PROJECT_DIR=/builds/yunohost/yunohost CONTAINER_ID="runner-$CUSTOM_ENV_CI_RUNNER_ID-project-$CUSTOM_ENV_CI_PROJECT_ID-concurrent-$CUSTOM_ENV_CI_CONCURRENT_PROJECT_ID-$CUSTOM_ENV_CI_JOB_ID" DEBIAN_VERSION="$CUSTOM_ENV_DEBIAN_VERSION" +DEBIAN_VERSION=$(echo $CUSTOM_ENV_CI_JOB_IMAGE | cut -d':' -f1) if [ -z "$DEBIAN_VERSION" ] then DEBIAN_VERSION="stretch" fi -PROJECT_DIR="$CUSTOM_ENV_CI_PROJECT_DIR" -PROJECT_NAME="$CUSTOM_ENV_CI_PROJECT_NAME" -SNAPSHOT_NAME="$CUSTOM_ENV_SNAPSHOT_NAME" +SNAPSHOT_NAME=$(echo $CUSTOM_ENV_CI_JOB_IMAGE | cut -d':' -f2) if [ -z "$SNAPSHOT_NAME" ] then SNAPSHOT_NAME="after-postinstall" -fi \ No newline at end of file +fi +PROJECT_DIR="$CUSTOM_ENV_CI_PROJECT_DIR" +PROJECT_NAME="$CUSTOM_ENV_CI_PROJECT_NAME" \ No newline at end of file