diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-24 15:09:11 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-24 06:45:01 +0000 |
| commit | 200fd44439f0754c5dcbf84312dfc707b7683fe5 (patch) | |
| tree | f9219e93afe7edca353eee7e7b62041764553578 | |
| parent | 8e2a107d071b672c7e691c2611f212e121c1db26 (diff) | |
| download | libinput-200fd44439f0754c5dcbf84312dfc707b7683fe5.tar.gz | |
gitlab CI: pass the MESON_ARGS through to the VM as well
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab-ci/gitlab-ci.tmpl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 584a65d8..7b5a6f15 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -519,6 +519,7 @@ freebsd:11.2@container-clean: - "scp -P 5555 -r $PWD localhost:" - echo "CI_JOB_ID=\"$CI_JOB_ID\"" > sshenv - echo "CI_JOB_NAME=\"$CI_JOB_NAME\"" >> sshenv + - echo "MESON_ARGS=\"$MESON_ARGS\"" >> sshenv - echo "MESON_BUILDDIR=\"$MESON_BUILDDIR\"" >> sshenv - echo "MESON_TEST_ARGS=\"$MESON_TEST_ARGS $SUITES\"" >> sshenv - echo "NINJA_ARGS=\"$NINJA_ARGS\"" >> sshenv diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl index 5e1a7000..eca3b5e1 100644 --- a/.gitlab-ci/gitlab-ci.tmpl +++ b/.gitlab-ci/gitlab-ci.tmpl @@ -408,6 +408,7 @@ freebsd:11.2@container-clean: - "scp -P 5555 -r $PWD localhost:" - echo "CI_JOB_ID=\"$CI_JOB_ID\"" > sshenv - echo "CI_JOB_NAME=\"$CI_JOB_NAME\"" >> sshenv + - echo "MESON_ARGS=\"$MESON_ARGS\"" >> sshenv - echo "MESON_BUILDDIR=\"$MESON_BUILDDIR\"" >> sshenv - echo "MESON_TEST_ARGS=\"$MESON_TEST_ARGS $SUITES\"" >> sshenv - echo "NINJA_ARGS=\"$NINJA_ARGS\"" >> sshenv |