projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5966905)
ci: Update the windows image
authorJordan Petridis <jordan@centricular.com>
Fri, 29 Jul 2022 17:12:46 +0000 (20:12 +0300)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Fri, 29 Jul 2022 19:56:11 +0000 (19:56 +0000)
Mainly to get newer meson

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2812>

.gitlab-ci.yml patch | blob | history
ci/docker/windows/Dockerfile patch | blob | history

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4320614..c712f85 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ variables:
   ###
   FEDORA_TAG:  '2022-03-14.0'
   INDENT_TAG: '2022-03-07.1'
-  WINDOWS_TAG: "2022-05-16.1"
+  WINDOWS_TAG: "2022-07-29.0"
 
   GST_UPSTREAM_REPO: 'gstreamer/gstreamer'
   FDO_UPSTREAM_REPO: 'gstreamer/gstreamer'
diff --git a/ci/docker/windows/Dockerfile b/ci/docker/windows/Dockerfile
index 77ba0a1..8af60a3 100644 (file)
--- a/ci/docker/windows/Dockerfile
+++ b/ci/docker/windows/Dockerfile
@@ -51,7 +51,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.60.3
+RUN pip3 install meson==0.62.2
 
 RUN 'git config --global user.email "cirunner@gstreamer.freedesktop.org"; git config --global user.name "GStreamer CI system"'
 
Domain: Multimedia / Media Common;