revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

Revert "Remove GnuWin, add Git Bash to the path"

Browse source 
This reverts commit 18ff65644e.

Image with that change fails to build with some obscure errors
with file access.
This commit is contained in:
Mikhail Goncharov 2021-04-24 19:01:01 +02:00
parent cb873efbbf
commit ded88cee7f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
containers/agent-windows-vs2019/Dockerfile
View file

@ -40,6 +40,7 @@ RUN powershell -NoProfile -InputFormat None -Command `
# install tools as described in https://llvm.org/docs/GettingStartedVS.html # install tools as described in https://llvm.org/docs/GettingStartedVS.html
# and a few more that were not documented... # and a few more that were not documented...
RUN choco install -y gnuwin
RUN choco install -y ninja git python3 RUN choco install -y ninja git python3
RUN choco install -y activeperl --version 5.24.3.2404001 RUN choco install -y activeperl --version 5.24.3.2404001
RUN choco install -y cmake --version 3.15.4 RUN choco install -y cmake --version 3.15.4
@ -56,7 +57,7 @@ ENV PYTHONIOENCODING=UTF-8
# update the path variable # update the path variable
# C:\Program Files\Git\usr\bin contains a usable bash and other unix tools. # C:\Program Files\Git\usr\bin contains a usable bash and other unix tools.
RUN powershell -NoProfile -InputFormat None -Command ` 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 Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $path
# use this folder to store the worksapce' # use this folder to store the worksapce'