diff options
| author | Biswapriyo Nath <nathbappai@gmail.com> | 2021-02-13 20:51:35 +0530 |
|---|---|---|
| committer | Jordan Petridis <jordan@centricular.com> | 2021-02-16 15:57:39 +0200 |
| commit | 2cd6f5f6b9051eda49f97513b178343f12333c57 (patch) | |
| tree | d67d94e26743975972a9976b4ddb8c9ac5fbc2e9 | |
| parent | 26a990454c958b0f9771b5c8392564734121e212 (diff) | |
docker/windows: Update msys2 installer to 2021-02-15 version.
This fixes the PGP key installation issue.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/396>
| -rw-r--r-- | docker/windows/build_image.ps1 | 2 | ||||
| -rw-r--r-- | docker/windows/install_toolchain.ps1 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/windows/build_image.ps1 b/docker/windows/build_image.ps1 index 4e19de3..8494dfd 100644 --- a/docker/windows/build_image.ps1 +++ b/docker/windows/build_image.ps1 @@ -1,5 +1,5 @@ $env:DEFAULT_BRANCH='master' -$env:VERSION='v13' +$env:VERSION='v17' $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 . diff --git a/docker/windows/install_toolchain.ps1 b/docker/windows/install_toolchain.ps1 index cd6f147..a29330b 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://github.com/msys2/msys2-installer/releases/download/2020-05-22/msys2-base-x86_64-20200522.tar.xz' +$msys2_url = 'https://github.com/msys2/msys2-installer/releases/download/2021-02-15/msys2-base-x86_64-20210215.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" |