diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-03 20:35:44 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-03 20:40:40 +1000 |
| commit | ff8a5b065caaa06e68467233d099189e738990a1 (patch) | |
| tree | bb45dbce2610bc725e1511ca59932a61a6fdb199 /.gitlab-ci.yml | |
| parent | 925b2aa26d41fa0ed1d9bd0aba7dcd107a9b59a7 (diff) | |
| download | libevdev-ff8a5b065caaa06e68467233d099189e738990a1.tar.gz | |
gitlab CI: switch the custom builds to Fedora 31
With b65be7aa79 the centos 7 RPMs don't include doxygen anymore, causing a CI
pipeline failure (but only where the centos image is being rebuilt).
Fedora is a better early-warning system about possible breakages than Centos -
which was originally chosen precisely because it doesn't update much and was
faster to run in the CI (this was before custom docker images).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16aa4a2..1ced013 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -481,47 +481,47 @@ alpine:latest@default-build: # # We only run the build option combinations on one image # because they're supposed to fail equally on all -.centos-custom-build@template: +.fedora-custom-build@template: stage: build - extends: .centos-build@template + extends: .fedora-build@template variables: - CENTOS_VERSION: 7 - needs: ['centos:7@container-prep'] + FEDORA_VERSION: 31 + needs: ['fedora:31@container-prep'] -centos:7@no-valgrind: - extends: .centos-custom-build@template +fedora:31@no-valgrind: + extends: .fedora-custom-build@template before_script: - - yum remove -y valgrind + - dnf remove -y valgrind -centos:7@no-check: - extends: .centos-custom-build@template +fedora:31@no-check: + extends: .fedora-custom-build@template before_script: - - yum remove -y check check-devel + - dnf remove -y check check-devel -centos:7@no-doxygen: - extends: .centos-custom-build@template +fedora:31@no-doxygen: + extends: .fedora-custom-build@template before_script: - - yum remove -y doxygen + - dnf remove -y doxygen <<: *default_build variables: MAKE_ARGS: '' # disable distcheck, requires doxygen # doxygen is required for distcheck -centos:7@no-doxygen-check-valgrind: - extends: .centos-custom-build@template +fedora:31@no-doxygen-check-valgrind: + extends: .fedora-custom-build@template before_script: - - yum remove -y doxygen valgrind check check-devel + - dnf remove -y doxygen valgrind check check-devel <<: *default_build variables: MAKE_ARGS: '' # disable distcheck, requires doxygen -centos:7@no-nm: - extends: .centos-custom-build@template +fedora:31@no-nm: + extends: .fedora-custom-build@template before_script: - mv /usr/bin/nm /usr/bin/nm.moved -centos:7@enable-gcov: - extends: .centos-custom-build@template +fedora:31@enable-gcov: + extends: .fedora-custom-build@template <<: *default_artifacts variables: CONFIGURE_FLAGS: "--enable-gcov" |