diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-03-06 15:08:47 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-03-13 12:47:55 +1000 |
| commit | 7d2b4b5ffe8cdcfa043f674374375f190020cd13 (patch) | |
| tree | f3d149a9019def954a220f56b793c60cdac7e1b6 | |
| parent | bd8225286a39d5ffd5c7236d2585083f673cef06 (diff) | |
| download | libevdev-7d2b4b5ffe8cdcfa043f674374375f190020cd13.tar.gz | |
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 <peter.hutterer@who-t.net>
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | .gitlab-ci/gitlab-ci.tmpl | 3 |
2 files changed, 2 insertions, 4 deletions
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 |