diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2021-01-04 10:45:41 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-01-04 10:59:25 +1000 |
| commit | 7f53bcfab348797e7e41b85b3044b52ccd8dfab0 (patch) | |
| tree | 33f07d9117f1034e8c0d359edba47a13bedc78c6 /.gitlab-ci | |
| parent | 896d087a0e047d8762077b32215e494cfa9e8e58 (diff) | |
| download | libevdev-7f53bcfab348797e7e41b85b3044b52ccd8dfab0.tar.gz | |
gitlab CI: make the custom build reference automated
We still require Fedora for the various jobs with custom autotools/meson
configurations. But we might as well make it dependent on the config file
entries only than hardcoding it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/ci.template | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index db9fdf2..2a5ed70 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -311,12 +311,13 @@ fedora:32@qemu-forced-rebuild: # # We only run the build option combinations on one image # because they're supposed to fail equally on all +{% set custom_build_distro = distributions|selectattr("name", "equalto", "fedora")|first() %} .fedora-custom-build@autotools-template: extends: - - .fedora:31 + - .{{custom_build_distro.name}}:{{custom_build_distro.versions|first()}} - .autotools-build@template stage: build - needs: ['fedora:31@container-prep'] + needs: ['{{custom_build_distro.name}}:{{custom_build_distro.versions|first()}}@container-prep'] no-valgrind:autotools: extends: .fedora-custom-build@autotools-template @@ -358,7 +359,7 @@ enable-gcov:autotools: - .fedora:31 - .meson-build@template stage: build - needs: ['fedora:31@container-prep'] + needs: ['{{custom_build_distro.name}}:{{custom_build_distro.versions|first()}}@container-prep'] no-valgrind:meson: extends: .fedora-custom-build@meson-template @@ -412,7 +413,7 @@ static-build:meson: soname: extends: - - .fedora:31 + - .{{custom_build_distro.name}}:{{custom_build_distro.versions|first()}} stage: build script: - ./autogen.sh --prefix=$PWD/prefix-autotools/ @@ -421,7 +422,7 @@ soname: - meson "$MESON_BUILDDIR" --prefix=$PWD/prefix-meson/ - ninja -C "$MESON_BUILDDIR" install - ls -l $PWD/prefix-meson/lib64/libevdev.so.2.3.0 - needs: ['fedora:31@container-prep'] + needs: ['{{custom_build_distro.name}}:{{custom_build_distro.versions|first()}}@container-prep'] ################################################################# # # |