From 609f614040d4c8b461e21b2d40822ac532535e50 Mon Sep 17 00:00:00 2001 From: Mikhail Goncharov Date: Fri, 19 Mar 2021 14:34:53 +0000 Subject: [PATCH] put back gnuwin --- containers/agent-windows-buildkite/VERSION | Bin 10 -> 10 bytes containers/agent-windows-vs2019/Dockerfile | 3 ++- containers/agent-windows-vs2019/VERSION | Bin 2 -> 8 bytes 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/containers/agent-windows-buildkite/VERSION b/containers/agent-windows-buildkite/VERSION index 9d1294d8efce87c756a4a8143aa5ce40eec92f01..9d097b344ddff1216909c1d4f487748fcc064b03 100644 GIT binary patch literal 10 RcmezW&yc}{ftP`c0RR>D0(t-d literal 10 RcmezW&yc~GftP`c0RR>70(k%c diff --git a/containers/agent-windows-vs2019/Dockerfile b/containers/agent-windows-vs2019/Dockerfile index e6c565d..495aa1a 100644 --- a/containers/agent-windows-vs2019/Dockerfile +++ b/containers/agent-windows-vs2019/Dockerfile @@ -40,6 +40,7 @@ RUN powershell -NoProfile -InputFormat None -Command ` # install tools as described in https://llvm.org/docs/GettingStartedVS.html # and a few more that were not documented... +RUN choco install -y gnuwin RUN choco install -y ninja git python3 RUN choco install -y activeperl --version 5.28.0.20210106 RUN choco install -y cmake --version 3.15.4 @@ -56,7 +57,7 @@ ENV PYTHONIOENCODING=UTF-8 # update the path variable # C:\Program Files\Git\usr\bin contains a usable bash and other unix tools. RUN powershell -NoProfile -InputFormat None -Command ` - $path = $env:path + ';C:\Program Files\CMake\bin;C:\Program Files\Git\usr\bin'; ` + $path = $env:path + ';C:\Program Files\CMake\bin;c:\Program Files (x86)\GnuWin32\bin'; ` Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $path # use this folder to store the worksapce' diff --git a/containers/agent-windows-vs2019/VERSION b/containers/agent-windows-vs2019/VERSION index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..9a5fce66dfe976e22015817718e338746049d317 100644 GIT binary patch literal 8 PcmezW&w_!Mfr|kE5Q+j# literal 2 JcmXr#0ssJd073u&