diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f26e635f..36e86de73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,10 +11,10 @@ cache: - _ccache/ variables: - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v20" - COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v8" - DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v15" - MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v10" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v19" + COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7" + DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v14" + MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v9" MESON_TEST_TIMEOUT_MULTIPLIER: 4 G_MESSAGES_DEBUG: all MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings" @@ -439,9 +439,6 @@ freebsd-12-x86_64: LANG: C.UTF-8 before_script: - bash .gitlab-ci/show-execution-environment.sh - - python3 -m ensurepip --user - - /var/tmp/gitlab_runner/.local/bin/pip3 install --user meson==0.64.0 - - export PATH=/var/tmp/gitlab_runner/.local/bin:$PATH script: # We cannot use -Wl,--no-undefined because GLib uses 'environ' variable. # FreeBSD supports xattr, but its API is different from Linux xattr. @@ -475,9 +472,6 @@ freebsd-13-x86_64: LANG: C.UTF-8 before_script: - bash .gitlab-ci/show-execution-environment.sh - - python3 -m ensurepip --user - - /var/tmp/gitlab_runner/.local/bin/pip3 install --user meson==0.64.0 - - export PATH=/var/tmp/gitlab_runner/.local/bin:$PATH script: - meson ${MESON_COMMON_OPTIONS} --localstatedir=/var -Db_lundef=false -Dxattr=false _build - ninja -C _build @@ -509,7 +503,7 @@ macos: CFLAGS: '-Wno-overlength-strings' before_script: - bash .gitlab-ci/show-execution-environment.sh - - pip3 install --user meson==0.64.0 + - pip3 install --user meson==0.60.1 - pip3 install --user ninja - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH script: diff --git a/.gitlab-ci/coverity.Dockerfile b/.gitlab-ci/coverity.Dockerfile index fb8753640..241861ec9 100644 --- a/.gitlab-ci/coverity.Dockerfile +++ b/.gitlab-ci/coverity.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/glib/fedora:v20 +FROM registry.gitlab.gnome.org/gnome/glib/fedora:v18 ARG COVERITY_SCAN_PROJECT_NAME ARG COVERITY_SCAN_TOKEN diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile index 19b16acdf..b2559cad6 100644 --- a/.gitlab-ci/debian-stable.Dockerfile +++ b/.gitlab-ci/debian-stable.Dockerfile @@ -66,7 +66,7 @@ RUN locale-gen de_DE.UTF-8 \ ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8 -RUN pip3 install meson==0.64.0 +RUN pip3 install meson==0.60.3 # FIXME: Once we use Debian Bookworm, we can just install the `reuse` package RUN pip3 install reuse==1.0.0 diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 069e3b9fe..85f910cb9 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -74,7 +74,7 @@ RUN dnf -y update \ make \ && dnf clean all -RUN pip3 install meson==0.64.0 +RUN pip3 install meson==0.60.3 COPY install-gitlab-cobertura-tools.sh . RUN ./install-gitlab-cobertura-tools.sh diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile index 736142b69..b109122fc 100644 --- a/.gitlab-ci/mingw.Dockerfile +++ b/.gitlab-ci/mingw.Dockerfile @@ -57,7 +57,7 @@ RUN dnf -y install \ WORKDIR /opt COPY cross_file_mingw64.txt /opt -RUN pip3 install meson==0.64.0 +RUN pip3 install meson==0.60.3 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index 97b39552d..1ad2e4a57 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -12,7 +12,7 @@ for %%x in (%*) do ( set args=%args:~1% :: FIXME: make warnings fatal -pip3 install --upgrade --user meson==0.64.0 || goto :error +pip3 install --upgrade --user meson==0.60.3 || goto :error meson %args% _build || goto :error python .gitlab-ci/check-missing-install-tag.py _build || goto :error ninja -C _build || goto :error diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index f83a8e714..8b24c243d 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -26,7 +26,7 @@ CCACHE_BASEDIR="$(pwd)" CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" export CCACHE_BASEDIR CCACHE_DIR -pip3 install --upgrade --user meson==0.64.0 +pip3 install --upgrade --user meson==0.60.3 PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH" DIR="$(pwd)" diff --git a/meson.build b/meson.build index 6e0f679f8..422e30653 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('glib', 'c', version : '2.75.1', # NOTE: See the policy in docs/meson-version.md before changing the Meson dependency - meson_version : '>= 0.64.0', + meson_version : '>= 0.60.0', default_options : [ 'buildtype=debugoptimized', 'warning_level=3',