From 869fa72595ffd8a92dc8795b6202acb04ea85eed Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Tue, 2 Jun 2020 11:33:47 +0300
Subject: [PATCH] docker/windows: update msys snapshot

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/297>
---
 docker/windows/build_image.ps1       | 3 ++-
 docker/windows/install_toolchain.ps1 | 2 +-
 gitlab/ci_template.yml               | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/windows/build_image.ps1 b/docker/windows/build_image.ps1
index 9b1e26b856..490ecc6813 100644
--- a/docker/windows/build_image.ps1
+++ b/docker/windows/build_image.ps1
@@ -1,5 +1,6 @@
 $env:DEFAULT_BRANCH='master'
-$env:tag ="registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v10-$env:DEFAULT_BRANCH"
+$env:VERSION='v11'
+$env:tag ="registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:$env:VERSION-$env:DEFAULT_BRANCH"
 echo "Building $env:tag"
 docker build --build-arg DEFAULT_BRANCH=$env:DEFAULT_BRANCH -f Dockerfile -t $env:tag .
 # docker push $tag
diff --git a/docker/windows/install_toolchain.ps1 b/docker/windows/install_toolchain.ps1
index 66a4df73b0..cd6f147981 100644
--- a/docker/windows/install_toolchain.ps1
+++ b/docker/windows/install_toolchain.ps1
@@ -1,7 +1,7 @@
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
 
 $msvc_2017_url = 'https://aka.ms/vs/15/release/vs_buildtools.exe'
-$msys2_url = 'https://netcologne.dl.sourceforge.net/project/msys2/Base/x86_64/msys2-base-x86_64-20190524.tar.xz'
+$msys2_url = 'https://github.com/msys2/msys2-installer/releases/download/2020-05-22/msys2-base-x86_64-20200522.tar.xz'
 $msys_mingw_get_url = 'https://dotsrc.dl.osdn.net/osdn/mingw/68260/mingw-get-0.6.3-mingw32-pre-20170905-1-bin.tar.xz'
 
 Write-Host "Installing VisualStudio"
diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index ad87c3e108..6eee99171f 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -12,7 +12,7 @@ variables:
   FEDORA_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora:2020-06-04-2958178-master'
   INDENT_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/gst-indent:6f7e01e1e30a73efa880acdc8e911f1f20c58dbb'
   MANIFEST_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/build-manifest:2020-02-10-1589542-master'
-  WINDOWS_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v10'
+  WINDOWS_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v11-master'
 
   # Branch to track for modules that have no ref specified in the manifest
   GST_UPSTREAM_BRANCH: 'master'