From 1b50e7c5cde2d4acc6fe2b04cab27022d83f5ae2 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 21 Oct 2024 21:20:12 +0900 Subject: [PATCH] Reverted MinGW --- Dockerfiles/build-base/windows/Dockerfile.agent2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2 index ec7189a06..1d8fed29d 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-base/windows/Dockerfile.agent2 @@ -19,7 +19,7 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.35 ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v2.33.0.windows.2/MinGit-2.33.0.2-busybox-64-bit.zip ARG SEVEN_ZIP_URL=https://www.7-zip.org/a/7z$SEVEN_ZIP_VERSION-$BUILD_ARCH.msi -ARG MINGW_URL=https://github.com/niXman/mingw-builds-binaries/releases/download/12.2.0-rt_v10-rev0/x86_64-12.2.0-release-win32-sjlj-rt_v10-rev0.7z +ARG MINGW_URL=https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-win32/sjlj/x86_64-8.1.0-release-win32-sjlj-rt_v6-rev0.7z ARG VS_BUILDTOOLS_URL=https://aka.ms/vs/17/release/vs_buildtools.exe ARG GOLANG_URL=https://go.dev/dl/go$GOLANG_VERSION.windows-amd64.zip ARG MSYS2_URL=https://api.github.com/repos/msys2/msys2-installer/releases/latest @@ -92,9 +92,9 @@ RUN Set-Location -Path $env:SystemDrive\.; ` }; ` ` Write-Host ('Downloading {0} ...' -f $env:MINGW_URL); ` - Invoke-WebRequest -OutFile $env:TEMP\mingw.7z -Uri $env:MINGW_URL; ` + (new-object System.Net.WebClient).DownloadFile("""$env:MINGW_URL""","""$env:TEMP\mingw.7z"""); ` ` - $sha256 = 'baf98a71849ab0b619aee0cf7caa2e63e963c2cc193d241867536960257630e3'; ` + $sha256 = 'e8c65ddc655534b0330f66f7b480565621e8617cda9937d76ba141a22bf3b2fa'; ` $d_sha256 = (Get-FileHash $env:TEMP\mingw.7z -Algorithm sha256).Hash; ` Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); ` if ($d_sha256 -ne $sha256) { `