Keep version numbers sequential

Our ci image versions don't correspond to Fedora
release numbers. Changing that just for one branch
would be more confusing than helpful, I think.
This commit is contained in:
Matthias Clasen 2022-06-23 07:44:39 -04:00
parent fa8135d58a
commit f5890c9151

View File

@ -7,13 +7,13 @@ cache:
- _ccache/ - _ccache/
fedora-autotools: fedora-autotools:
image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v35 image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v3
stage: build stage: build
script: script:
- bash -x ./.gitlab-ci/test-docker-autotools.sh - bash -x ./.gitlab-ci/test-docker-autotools.sh
fedora-distcheck: fedora-distcheck:
image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v35 image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v3
variables: variables:
DO_DISTCHECK: "yes" DO_DISTCHECK: "yes"
when: manual when: manual
@ -22,7 +22,7 @@ fedora-distcheck:
- bash -x ./.gitlab-ci/test-docker-autotools.sh - bash -x ./.gitlab-ci/test-docker-autotools.sh
fedora-meson: fedora-meson:
image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v35 image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v3
stage: build stage: build
variables: variables:
EXTRA_MESON_FLAGS: "-Ddefault_library=both" EXTRA_MESON_FLAGS: "-Ddefault_library=both"
@ -50,7 +50,7 @@ debian-meson:
- "_build/testsuite/reftests/output" - "_build/testsuite/reftests/output"
reference: reference:
image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v35 image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v3
stage: docs stage: docs
variables: variables:
EXTRA_MESON_FLAGS: "--buildtype=release -Dgtk_doc=true -Dman=true" EXTRA_MESON_FLAGS: "--buildtype=release -Dgtk_doc=true -Dman=true"