From 5a9368f4dae763321b72b5d3ae9c2d91d73eea98 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 20 Feb 2020 16:59:54 +1000 Subject: [PATCH] gitlab CI: fix a variable substitution Single quotes means we're not expanding the variable here Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 2 +- .gitlab-ci/gitlab-ci.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d52966e..3068ee2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,7 +107,7 @@ variables: script: - meson "$MESON_BUILDDIR" $MESON_ARGS - ninja -C "$MESON_BUILDDIR" $NINJA_ARGS - - if ! [[ -z '$MESON_TEST_ARGS' ]]; then + - if ! [[ -z "$MESON_TEST_ARGS" ]]; then meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS; fi diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl index 2165a67..c45549f 100644 --- a/.gitlab-ci/gitlab-ci.tmpl +++ b/.gitlab-ci/gitlab-ci.tmpl @@ -107,7 +107,7 @@ variables: script: - meson "$MESON_BUILDDIR" $MESON_ARGS - ninja -C "$MESON_BUILDDIR" $NINJA_ARGS - - if ! [[ -z '$MESON_TEST_ARGS' ]]; then + - if ! [[ -z "$MESON_TEST_ARGS" ]]; then meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS; fi