From: Peter Hutterer Date: Fri, 6 Mar 2020 05:08:47 +0000 (+1000) Subject: gitlab CI: remove obsolete variable expansion X-Git-Tag: libevdev-1.9.1~23 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d2b4b5ffe8cdcfa043f674374375f190020cd13;p=platform%2Fupstream%2Flibevdev.git gitlab CI: remove obsolete variable expansion gitlab doesn't support double-nested variables so we can assume that these variables don't need further expansion Signed-off-by: Peter Hutterer --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acc5293..5d4859e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -190,8 +190,7 @@ check-commit: # log in to the registry - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - # get the full container image name (FDO_DISTRIBUTION_VERSION still has indirections) - - IMAGE=$(eval echo "$FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG") + - IMAGE="$FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG" - | # force rebuild if schedule, reuse otherwise diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl index 8ebb383..d8a58d7 100644 --- a/.gitlab-ci/gitlab-ci.tmpl +++ b/.gitlab-ci/gitlab-ci.tmpl @@ -127,8 +127,7 @@ check-commit: # log in to the registry - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - # get the full container image name (FDO_DISTRIBUTION_VERSION still has indirections) - - IMAGE=$(eval echo "$FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG") + - IMAGE="$FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG" - | # force rebuild if schedule, reuse otherwise