From 3145164ee78bf50f3c99b7110b9bec097a9121c8 Mon Sep 17 00:00:00 2001 From: Mikhail Goncharov Date: Tue, 28 Mar 2023 12:04:32 +0200 Subject: [PATCH] update buildkite-premerge-windows to recent llvm --- containers/agent-windows-vs2019/Dockerfile | 8 ++++---- containers/buildkite-premerge-windows/Dockerfile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/containers/agent-windows-vs2019/Dockerfile b/containers/agent-windows-vs2019/Dockerfile index 0c76af9..95f43e0 100644 --- a/containers/agent-windows-vs2019/Dockerfile +++ b/containers/agent-windows-vs2019/Dockerfile @@ -12,9 +12,9 @@ ARG CHANNEL_URL=https://aka.ms/vs/16/release/channel ADD ${CHANNEL_URL} C:\TEMP\VisualStudio.chman # 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 -# - 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 # - Documentation on flags # 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 ` || 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. # 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" & ` @@ -73,7 +73,7 @@ RUN curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20230320/l # configure Python encoding 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:\llvm-mingw\bin contains Clang configured for mingw targets and # corresponding sysroots. Both the 'llvm' package (with Clang defaulting diff --git a/containers/buildkite-premerge-windows/Dockerfile b/containers/buildkite-premerge-windows/Dockerfile index 1b27ef1..4e3f63e 100644 --- a/containers/buildkite-premerge-windows/Dockerfile +++ b/containers/buildkite-premerge-windows/Dockerfile @@ -68,10 +68,10 @@ RUN pip install psutil # install python dependencies for the scripts 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 . && ` 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 ENV PYTHONIOENCODING=UTF-8