From 2769986ca9ede709bff995e04c17bfd9ce8db4ff Mon Sep 17 00:00:00 2001 From: Andoni Morales Alastruey Date: Thu, 26 Jan 2023 21:42:41 +0100 Subject: [PATCH] ci: update meson to 1.1.1 in the CI image co-authored-by: Jordan Petridis Part-of: --- .gitlab-image-tags.yml | 4 ++-- ci/docker/fedora/prepare.sh | 3 +-- ci/docker/windows/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-image-tags.yml b/.gitlab-image-tags.yml index 937cb9849f..d3a79ada35 100644 --- a/.gitlab-image-tags.yml +++ b/.gitlab-image-tags.yml @@ -5,7 +5,7 @@ variables: # If you are hacking on them or need a them to rebuild, its enough # to change any part of the string of the image you want. ### - FEDORA_TAG: '2023-06-02.0' + FEDORA_TAG: '2023-06-12.0' INDENT_TAG: '2023-03-16.1' LINT_TAG: '2023-02-16.5' - WINDOWS_TAG: '2023-06-02.0' + WINDOWS_TAG: '2023-06-12.0' diff --git a/ci/docker/fedora/prepare.sh b/ci/docker/fedora/prepare.sh index 663be4dc2d..716d1482b7 100644 --- a/ci/docker/fedora/prepare.sh +++ b/ci/docker/fedora/prepare.sh @@ -207,8 +207,7 @@ dnf remove -y meson # FIXME: Install ninja from rpm when we update our base image as we fail building # documentation with rust plugins as we the version from F31 we hit: # `ninja: error: build.ninja:26557: multiple outputs aren't (yet?) supported by depslog; bring this up on the mailing list if it affects you -pip3 install meson==0.62.2 hotdoc==0.15 python-gitlab ninja tomli - +pip3 install meson==1.1.1 hotdoc==0.15 python-gitlab ninja tomli # Remove gst-devel packages installed by builddep above dnf remove -y "gstreamer1*devel" diff --git a/ci/docker/windows/Dockerfile b/ci/docker/windows/Dockerfile index 0f9e941591..5e48f4602a 100644 --- a/ci/docker/windows/Dockerfile +++ b/ci/docker/windows/Dockerfile @@ -52,7 +52,7 @@ RUN Get-ChildItem C:\BuildTools RUN Get-ChildItem C:\BuildTools\VC\Tools\MSVC RUN Get-ChildItem 'C:\Program Files (x86)\Windows Kits\10\lib' -RUN pip3 install meson==0.62.2 +RUN pip3 install meson==1.1.1 RUN 'git config --global user.email "cirunner@gstreamer.freedesktop.org"; git config --global user.name "GStreamer CI system"'