gitlab CI: make the tarball distro selection automatic

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2021-05-19 10:29:00 +10:00
parent 4e5babd7a1
commit a53c6d1154
3 changed files with 9 additions and 5 deletions

View file

@ -952,4 +952,4 @@ autotools-from-tarball:
- popd > /dev/null
- popd > /dev/null
- ls -lR $INSTALLDIR
needs: ['fedora:32@container-prep']
needs: ['fedora:32@container-prep']

View file

@ -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 %}

View file

@ -9,6 +9,7 @@ distributions:
- name: fedora
tag: *default_tag
want_qemu: true
use_for_tarball_tests: true
versions:
- '33'
- '32'