1
0
Fork 0

remove gnuwin and cmake

relanding #290
also apparently vs cmake was always used, removing seaprate installation
This commit is contained in:
Mikhail Goncharov 2021-04-27 16:57:03 +00:00
parent 31cbc77e38
commit aeba5401d1
4 changed files with 5 additions and 9 deletions

View file

@ -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

View file

@ -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

View file

@ -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