summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorPhilip Withnall <pwithnall@endlessos.org>2022-11-16 12:01:02 +0000
committerPhilip Withnall <pwithnall@endlessos.org>2022-11-23 10:39:13 +0000
commit91f14cd058555f16b5abef1a577332921b08497b (patch)
treeb745045de86af369d4bf41b23433afa61edeb7c4 /.gitlab-ci
parent96bc6d6e7cdc1cd24e54f1499092c0354991e391 (diff)
downloadglib-91f14cd058555f16b5abef1a577332921b08497b.tar.gz
build: Bump Meson dependency to 0.64.0
It will fix dependency ordering issues found in https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2917#note_1559190. As per `docs/meson-version.md`, we can depend on Meson ≤0.64.0 now as it’s in Debian Testing. The FreeBSD runners have to be changed to explicitly install the right version of Meson using `pip3`, as the system-installed version is not quite new enough. See https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3077#note_1596257. Signed-off-by: Philip Withnall <pwithnall@endlessos.org> Helps: !2917
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/coverity.Dockerfile2
-rw-r--r--.gitlab-ci/debian-stable.Dockerfile2
-rw-r--r--.gitlab-ci/fedora.Dockerfile2
-rw-r--r--.gitlab-ci/mingw.Dockerfile2
-rw-r--r--.gitlab-ci/test-msvc.bat2
-rwxr-xr-x.gitlab-ci/test-msys2.sh2
6 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci/coverity.Dockerfile b/.gitlab-ci/coverity.Dockerfile
index 241861ec9..fb8753640 100644
--- a/.gitlab-ci/coverity.Dockerfile
+++ b/.gitlab-ci/coverity.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/glib/fedora:v18
+FROM registry.gitlab.gnome.org/gnome/glib/fedora:v20
ARG COVERITY_SCAN_PROJECT_NAME
ARG COVERITY_SCAN_TOKEN
diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile
index b2559cad6..19b16acdf 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.60.3
+RUN pip3 install meson==0.64.0
# 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 85f910cb9..069e3b9fe 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.60.3
+RUN pip3 install meson==0.64.0
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 b109122fc..736142b69 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.60.3
+RUN pip3 install meson==0.64.0
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 1ad2e4a57..97b39552d 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.60.3 || goto :error
+pip3 install --upgrade --user meson==0.64.0 || 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 8b24c243d..f83a8e714 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.60.3
+pip3 install --upgrade --user meson==0.64.0
PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH"
DIR="$(pwd)"