summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2021-05-12 07:39:05 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2021-05-12 10:23:33 +1000
commit5a6f141bd86c5c141bbf0ac8007198fa11685657 (patch)
tree2052d74f89f7a71cd5c9cd99ed065208a25e97ba /.gitlab-ci
parentcf1abf08186f607b20bd7fdec32b7ab16378f1aa (diff)
downloadlibinput-5a6f141bd86c5c141bbf0ac8007198fa11685657.tar.gz
gitlab CI: bump from Fedora 32 to 34
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/ci.template4
-rw-r--r--.gitlab-ci/config.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index b51e5c14..9970c026 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -704,10 +704,10 @@ build rpm:
- .policy
stage: deploy
variables:
- FDO_DISTRIBUTION_VERSION: '32'
+ FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- - "fedora:32@container-prep"
+ - "fedora:33@container-prep"
script:
- dnf install -y rpmdevtools jq
- meson "$MESON_BUILDDIR"
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 4046a023..3f074c49 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-01-04.1'
+.default_tag: &default_tag '2021-05-12.0'
distributions:
- name: fedora
tag: *default_tag
versions:
- - '32'
- '33'
+ - '34' # last is picked for qemu
want_qemu: true
use_for_custom_build_tests: true
packages: