diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f091e761..3ec1e53e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ variables: MESON_COMMON_OPTIONS: "--buildtype debug --fatal-meson-warnings" fedora-x86_64: - image: registry.gitlab.gnome.org/gnome/glib/fedora:v3 + image: registry.gitlab.gnome.org/gnome/glib/fedora:v4 stage: build except: - tags @@ -55,7 +55,7 @@ fedora-x86_64: - "_coverage" debian-stable-x86_64: - image: registry.gitlab.gnome.org/gnome/glib/debian-stable:v3 + image: registry.gitlab.gnome.org/gnome/glib/debian-stable:v4 stage: build except: - tags @@ -84,7 +84,7 @@ debian-stable-x86_64: - "_build/${CI_JOB_NAME}-report.xml" G_DISABLE_ASSERT: - image: registry.gitlab.gnome.org/gnome/glib/fedora:v3 + image: registry.gitlab.gnome.org/gnome/glib/fedora:v4 stage: build except: - tags @@ -112,7 +112,7 @@ G_DISABLE_ASSERT: - "_build/${CI_JOB_NAME}-report.xml" valgrind: - image: registry.gitlab.gnome.org/gnome/glib/fedora:v3 + image: registry.gitlab.gnome.org/gnome/glib/fedora:v4 stage: analysis except: - tags @@ -289,7 +289,7 @@ freebsd-12-x86_64: - "_build/${CI_JOB_NAME}-report.xml" coverage: - image: registry.gitlab.gnome.org/gnome/glib/fedora:v3 + image: registry.gitlab.gnome.org/gnome/glib/fedora:v4 stage: coverage except: - tags @@ -302,7 +302,7 @@ coverage: coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/' scan-build: - image: registry.gitlab.gnome.org/gnome/glib/fedora:v3 + image: registry.gitlab.gnome.org/gnome/glib/fedora:v4 stage: analysis except: - tags @@ -335,7 +335,7 @@ pages: - public dist-job: - image: registry.gitlab.gnome.org/gnome/glib/fedora:v3 + image: registry.gitlab.gnome.org/gnome/glib/fedora:v4 stage: build only: - tags diff --git a/.gitlab-ci/README.md b/.gitlab-ci/README.md index dc6c82131..6c128796e 100644 --- a/.gitlab-ci/README.md +++ b/.gitlab-ci/README.md @@ -6,10 +6,11 @@ GitLab CI jobs run in a Docker image, defined here. To update that image (perhaps to install some more packages): 1. Edit `.gitlab-ci/Dockerfile` with the changes you want -1. Run `.gitlab-ci/run-docker.sh build --base=debian --base-version=1` to build - the new image (bump the version as needed) -1. Run `.gitlab-ci/run-docker.sh push --base=debian --base-version=1` to upload - the new image to the GNOME GitLab Docker registry +1. Run `.gitlab-ci/run-docker.sh build --base=debian-stable --base-version=1` to + build the new image (bump the version from the latest listed for that `base` + on https://gitlab.gnome.org/GNOME/glib/container_registry) +1. Run `.gitlab-ci/run-docker.sh push --base=debian-stable --base-version=1` to + upload the new image to the GNOME GitLab Docker registry * If this is the first time you're doing this, you'll need to log into the registry * If you use 2-factor authentication on your GNOME GitLab account, you'll