diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73738794c5..c9460309ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ variables: ### FEDORA_TAG: '2021-12-03.1' INDENT_TAG: '2021-10-04.0' - WINDOWS_TAG: "2022-07-29.0-1.20" + WINDOWS_TAG: "2022-07-29.1-1.20" GST_UPSTREAM_REPO: 'gstreamer/gstreamer' FDO_UPSTREAM_REPO: 'gstreamer/gstreamer' diff --git a/ci/docker/windows/Dockerfile b/ci/docker/windows/Dockerfile index 8af60a303a..d6628b7afd 100644 --- a/ci/docker/windows/Dockerfile +++ b/ci/docker/windows/Dockerfile @@ -30,12 +30,11 @@ RUN c:\msys64\usr\bin\bash -lc 'pacman -S --noconfirm mingw-w64-ucrt-x86_64-tool # https://github.com/microsoft/vs-dockerfiles/blob/main/native-desktop/ # Set up environment to collect install errors. COPY Install.cmd C:\TEMP\ -ADD https://aka.ms/vscollect.exe C:\TEMP\collect.exe +RUN Invoke-WebRequest -Uri https://aka.ms/vscollect.exe -OutFile C:\TEMP\collect.exe # Download channel for fixed install. -ARG CHANNEL_URL=https://aka.ms/vs/16/release/channel -ADD ${CHANNEL_URL} C:\TEMP\VisualStudio.chman +RUN Invoke-WebRequest -Uri https://aka.ms/vs/16/release/channel -OutFile C:\TEMP\VisualStudio.chman # Download and install Build Tools for Visual Studio 2017 for native desktop workload. -ADD https://aka.ms/vs/16/release/vs_buildtools.exe C:\TEMP\vs_buildtools.exe +RUN Invoke-WebRequest -Uri https://aka.ms/vs/16/release/vs_buildtools.exe -OutFile C:\TEMP\vs_buildtools.exe RUN C:\TEMP\Install.cmd C:\TEMP\vs_buildtools.exe --quiet --wait --norestart --nocache ` --channelUri C:\TEMP\VisualStudio.chman ` --installChannelUri C:\TEMP\VisualStudio.chman `