diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2022-06-08 16:43:39 +1000 |
|---|---|---|
| committer | José Expósito <jose.exposito89@gmail.com> | 2022-06-11 10:54:15 +0000 |
| commit | 7888ef2787080beafe4dd53b56c779875de7392d (patch) | |
| tree | 48e7510a452413e54c38b9cdeb5e3c7a21173088 /.gitlab-ci | |
| parent | 6a1bd5b0c9be55d21c6e066a94fc6fd77fea96ce (diff) | |
| download | libinput-7888ef2787080beafe4dd53b56c779875de7392d.tar.gz | |
gitlab CI: bump to F35 and F36, as well as Ubuntu 21.10 and 22.04
F33 and F34 are both EOL. This also fixes the RPM build job to
automatically use the latest Fedora version and adds
wayland-protocols-devel which is now needed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/ci.template | 7 | ||||
| -rw-r--r-- | .gitlab-ci/config.yml | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 9839d6db..61faf67d 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -679,16 +679,18 @@ check-merge-request: junit: results.xml allow_failure: true +{% for distro in distributions if distro.name == "fedora" %} +{% set version = "{}".format(distro.versions|last()) %} build rpm: extends: - .fdo.distribution-image@fedora - .policy stage: deploy variables: - FDO_DISTRIBUTION_VERSION: '34' + FDO_DISTRIBUTION_VERSION: '36' FDO_DISTRIBUTION_TAG: $FEDORA_TAG needs: - - "fedora:33@container-prep" + - "fedora:36@container-prep" script: - dnf install -y rpmdevtools jq - meson "$MESON_BUILDDIR" @@ -702,6 +704,7 @@ build rpm: - cd "$MESON_BUILDDIR" - meson dist --no-test - rpmbuild -ta meson-dist/libinput*.tar.xz +{% endfor %} wayland-web: diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 6dab81fe..f5ddf8ee 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -3,14 +3,14 @@ # # We're happy to rebuild all containers when one changes. -.default_tag: &default_tag '2021-07-30.0' +.default_tag: &default_tag '2022-06-10.0' distributions: - name: fedora tag: *default_tag versions: - - '33' - - '34' # last is picked for qemu + - '35' + - '36' # last is picked for qemu want_qemu: true use_for_custom_build_tests: true use_for_qemu_tests: true @@ -35,6 +35,7 @@ distributions: - glib2-devel - mtdev-devel - diffutils + - wayland-protocols-devel - valgrind # for the valgrind run, optional - name: debian tag: *default_tag @@ -64,8 +65,8 @@ distributions: - name: ubuntu tag: *default_tag versions: - - '20.10' - - '21.04' + - '21.10' + - '22.04' packages: - git - gcc @@ -108,6 +109,7 @@ distributions: - gtk4 - mtdev - diffutils + - wayland-protocols - name: alpine tag: *default_tag versions: |