From: Peter Hutterer Date: Wed, 19 May 2021 00:29:00 +0000 (+1000) Subject: gitlab CI: make the tarball distro selection automatic X-Git-Tag: accepted/tizen/unified/20231121.102917~49 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4037caf3f1d533b9cd369530f2365141ed98159c;p=platform%2Fupstream%2Flibevdev.git gitlab CI: make the tarball distro selection automatic Signed-off-by: Peter Hutterer --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0cb1cab..7fb518c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -952,4 +952,4 @@ autotools-from-tarball: - popd > /dev/null - popd > /dev/null - ls -lR $INSTALLDIR - needs: ['fedora:32@container-prep'] \ No newline at end of file + needs: ['fedora:32@container-prep'] diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index de4c6b8..8d964cb 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -494,9 +494,11 @@ qemu:meson:valgrind: MESON_TEST_ARGS: '--setup=valgrind' {% endfor %} +{% for distro in distributions if distro.use_for_tarball_tests %} +{% set version = "{}".format(distro.versions|last()) %} meson-from-tarball: extends: - - .fedora:32 + - .{{distro.name}}:{{version}} stage: tarballs script: - export INSTALLDIR="$PWD/_inst" @@ -514,11 +516,11 @@ meson-from-tarball: - ninja -C "$MESON_BUILDDIR" install - popd > /dev/null - ls -lR $INSTALLDIR - needs: ['fedora:32@container-prep'] + needs: ['{{distro.name}}:{{version}}@container-prep'] autotools-from-tarball: extends: - - .fedora:32 + - .{{distro.name}}:{{version}} stage: tarballs script: - export INSTALLDIR="$PWD/_inst" @@ -536,4 +538,5 @@ autotools-from-tarball: - popd > /dev/null - popd > /dev/null - ls -lR $INSTALLDIR - needs: ['fedora:32@container-prep'] + needs: ['{{distro.name}}:{{version}}@container-prep'] +{% endfor %} diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 720385a..e059148 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -9,6 +9,7 @@ distributions: - name: fedora tag: *default_tag want_qemu: true + use_for_tarball_tests: true versions: - '33' - '32'