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

update buildkite-premerge-windows to recent llvm

Browse source
This commit is contained in:
Mikhail Goncharov 2023-03-28 12:04:32 +02:00
parent e857d63d8b
commit 3145164ee7
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,9 +12,9 @@ ARG CHANNEL_URL=https://aka.ms/vs/16/release/channel
ADD ${CHANNEL_URL} C:\TEMP\VisualStudio.chman ADD ${CHANNEL_URL} C:\TEMP\VisualStudio.chman
# Install Build Tools with C++ workload. # Install Build Tools with C++ workload.
# - Documentation for docker installation # - Documentation for docker installation
# https://docs.microsoft.com/en-us/visualstudio/install/build-tools-container?view=vs-2019 # https://docs.microsoft.com/en-us/visualstudio/install/build-tools-container?view=vs-2019
# - Documentation on workloads # - Documentation on workloads
# https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2019#c-build-tools # https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2019#c-build-tools
# - Documentation on flags # - Documentation on flags
# https://docs.microsoft.com/en-us/visualstudio/install/use-command-line-parameters-to-install-visual-studio?view=vs-2019 # https://docs.microsoft.com/en-us/visualstudio/install/use-command-line-parameters-to-install-visual-studio?view=vs-2019
@ -27,7 +27,7 @@ RUN C:\TEMP\vs_buildtools.exe --quiet --wait --norestart --nocache `
--includeRecommended ` --includeRecommended `
|| IF "%ERRORLEVEL%"=="3010" EXIT 0 || IF "%ERRORLEVEL%"=="3010" EXIT 0
# Register DIA dll (Debug Interface Access) so it can be used to symbolize # Register DIA dll (Debug Interface Access) so it can be used to symbolize
# the stack traces. Register dll for 32 and 64 bit. # the stack traces. Register dll for 32 and 64 bit.
# see https://developercommunity.visualstudio.com/content/problem/290674/msdia140dll-is-not-registered-on-vs2017-hosts.html # see https://developercommunity.visualstudio.com/content/problem/290674/msdia140dll-is-not-registered-on-vs2017-hosts.html
RUN regsvr32 /S "C:\BuildTools\DIA SDK\bin\amd64\msdia140.dll" & ` RUN regsvr32 /S "C:\BuildTools\DIA SDK\bin\amd64\msdia140.dll" & `
@ -73,7 +73,7 @@ RUN curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20230320/l
# configure Python encoding # configure Python encoding
ENV PYTHONIOENCODING=UTF-8 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.
# C:\llvm-mingw\bin contains Clang configured for mingw targets and # C:\llvm-mingw\bin contains Clang configured for mingw targets and
# corresponding sysroots. Both the 'llvm' package (with Clang defaulting # corresponding sysroots. Both the 'llvm' package (with Clang defaulting

4
containers/buildkite-premerge-windows/Dockerfile
View file

@ -68,10 +68,10 @@ RUN pip install psutil
# install python dependencies for the scripts # install python dependencies for the scripts
RUN pip install -r https://raw.githubusercontent.com/google/llvm-premerge-checks/main/scripts/requirements.txt RUN pip install -r https://raw.githubusercontent.com/google/llvm-premerge-checks/main/scripts/requirements.txt
RUN curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20220323/llvm-mingw-20220323-ucrt-x86_64.zip && ` RUN curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20230320/llvm-mingw-20230320-ucrt-x86_64.zip && `
powershell Expand-Archive llvm-mingw-*-ucrt-x86_64.zip -DestinationPath . && ` powershell Expand-Archive llvm-mingw-*-ucrt-x86_64.zip -DestinationPath . && `
del llvm-mingw-*-ucrt-x86_64.zip && ` del llvm-mingw-*-ucrt-x86_64.zip && `
ren llvm-mingw-20220323-ucrt-x86_64 llvm-mingw ren llvm-mingw-20230320-ucrt-x86_64 llvm-mingw
# configure Python encoding # configure Python encoding
ENV PYTHONIOENCODING=UTF-8 ENV PYTHONIOENCODING=UTF-8