From aeba5401d18639065a6fd6d02081865b13c21bb9 Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail@gmail.com>
Date: Tue, 27 Apr 2021 16:57:03 +0000
Subject: [PATCH] remove gnuwin and cmake

relanding #290
also apparently vs cmake was always used, removing seaprate installation
---
 containers/agent-windows-vs2019/Dockerfile |   9 ++++-----
 containers/agent-windows-vs2019/VERSION    | Bin 8 -> 0 bytes
 containers/build_deploy.ps1                |   3 +--
 containers/build_run.ps1                   |   2 --
 4 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 containers/agent-windows-vs2019/VERSION

diff --git a/containers/agent-windows-vs2019/Dockerfile b/containers/agent-windows-vs2019/Dockerfile
index 8866f3f..24d461b 100644
--- a/containers/agent-windows-vs2019/Dockerfile
+++ b/containers/agent-windows-vs2019/Dockerfile
@@ -40,10 +40,8 @@ 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.24.3.2404001
-RUN choco install -y cmake --version 3.15.4
 # libcxx requires clang(-cl) to be available
 RUN choco install -y sccache llvm
 RUN pip install psutil
@@ -56,9 +54,10 @@ 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 (x86)\GnuWin32\bin'; `
-    Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $path
+RUN powershell -Command `
+    [System.Environment]::SetEnvironmentVariable('PATH', `
+    [System.Environment]::GetEnvironmentVariable('PATH', 'machine') + ';C:\Program Files\Git\usr\bin', `
+    'machine')
 
 # use this folder to store the worksapce'
 VOLUME C:\ws
diff --git a/containers/agent-windows-vs2019/VERSION b/containers/agent-windows-vs2019/VERSION
deleted file mode 100644
index 67de34261ca5d1db3f1db04e1729dac1541f36b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8
PcmezW&ys<cfr|kE5Rd{+

diff --git a/containers/build_deploy.ps1 b/containers/build_deploy.ps1
index b4c4910..8b32150 100644
--- a/containers/build_deploy.ps1
+++ b/containers/build_deploy.ps1
@@ -35,8 +35,7 @@ Push-Location "$PSScriptRoot\$IMAGE_NAME"
 Write-Host "Building ${IMAGE_NAME}..."
 
 Invoke-Call -ScriptBlock {
-    docker build . --no-cache `
-        -t ${IMAGE_NAME}:latest
+    docker build . -t ${IMAGE_NAME}:latest
     }
 Invoke-Call -ScriptBlock {
     docker tag ${IMAGE_NAME}:latest ${QUALIFIED_NAME}:latest
diff --git a/containers/build_run.ps1 b/containers/build_run.ps1
index e7d9587..3717bd2 100644
--- a/containers/build_run.ps1
+++ b/containers/build_run.ps1
@@ -21,14 +21,12 @@ param(
 
 # set script to stop on first error
 $ErrorActionPreference = "Stop"
-$agent_windows_version=Get-Content "agent-windows-vs2019/VERSION"
 
 # some docs recommend setting 2GB memory limit
 docker build `
     --memory 2GB `
     -t $IMAGE_NAME `
     --build-arg token=$token  `
-    --build-arg agent_windows_version=$agent_windows_version `
     "$PSScriptRoot\$IMAGE_NAME"
 If ($LastExitCode -ne 0) {
     exit