From 60dd46347fe1104dd199151b93fff626b9d5079a Mon Sep 17 00:00:00 2001 From: Mikhail Goncharov Date: Wed, 8 Feb 2023 19:00:29 +0000 Subject: [PATCH] updated win agent --- Pipfile | 2 + .../buildkite-premerge-windows/Dockerfile | 100 ++++++++++++++++++ .../post-checkout.bat | 2 + .../pre-checkout.bat | 5 + .../start_agent.ps1 | 11 ++ scripts/windows_agent_start_buildkite.ps1 | 2 + 6 files changed, 122 insertions(+) create mode 100644 containers/buildkite-premerge-windows/Dockerfile create mode 100644 containers/buildkite-premerge-windows/post-checkout.bat create mode 100644 containers/buildkite-premerge-windows/pre-checkout.bat create mode 100644 containers/buildkite-premerge-windows/start_agent.ps1 diff --git a/Pipfile b/Pipfile index 49179e2..ca42728 100644 --- a/Pipfile +++ b/Pipfile @@ -15,6 +15,8 @@ python-benedict = "==0.23.2" GitPython = "==3.1.14" types-pyyaml = "*" pytest = "*" +chardet = "*" +certifi = "*" [dev-packages] diff --git a/containers/buildkite-premerge-windows/Dockerfile b/containers/buildkite-premerge-windows/Dockerfile new file mode 100644 index 0000000..b1ef40d --- /dev/null +++ b/containers/buildkite-premerge-windows/Dockerfile @@ -0,0 +1,100 @@ +# escape=` + +# Agent image for LLVM org cluster. +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 + +# Restore the default Windows shell for correct batch processing. +SHELL ["cmd", "/S", "/C"] + +# Download the Build Tools bootstrapper. +ADD https://aka.ms/vs/16/release/vs_buildtools.exe C:\TEMP\vs_buildtools.exe + +# Download channel for fixed install. +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 +# https://docs.microsoft.com/en-us/visualstudio/install/build-tools-container?view=vs-2019 +# - 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 +RUN C:\TEMP\vs_buildtools.exe --quiet --wait --norestart --nocache ` + --channelUri C:\TEMP\VisualStudio.chman ` + --installChannelUri C:\TEMP\VisualStudio.chman ` + --installPath C:\BuildTools ` + --add Microsoft.VisualStudio.Workload.VCTools ` + --add Microsoft.VisualStudio.Component.VC.ATL ` + --includeRecommended ` + || IF "%ERRORLEVEL%"=="3010" EXIT 0 + +# 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" & ` + regsvr32 /S "C:\BuildTools\DIA SDK\bin\msdia140.dll" + +# install chocolately as package manager +RUN powershell -NoProfile -InputFormat None -Command ` + iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')) ; ` + choco feature disable --name showDownloadProgress + +# install tools as described in https://llvm.org/docs/GettingStartedVS.html +# and a few more that were not documented... +RUN choco install -y ninja git +# Pin an older version of Python; the current Python 3.10 fails when +# doing "pip install" for the other dependencies, as it fails to find libxml +# while compiling some package. +RUN choco install -y python3 --version 3.9.7 + +# ActivePerl is currently not installable via Chocolatey, see +# http://disq.us/p/2ipditb. Install StrawberryPerl instead. Unfortunately, +# StrawberryPerl not only installs Perl, but also a redundant C/C++ compiler +# toolchain, and a copy of pkg-config which can cause misdetections for other +# built products, see +# https://github.com/StrawberryPerl/Perl-Dist-Strawberry/issues/11 for further +# details. Remove the redundant and unnecessary parts of the StrawberryPerl +# install. +RUN choco install -y strawberryperl && ` + rmdir /q /s c:\strawberry\c && ` + del /q c:\strawberry\perl\bin\pkg-config* + +# libcxx requires clang(-cl) to be available +RUN choco install -y sccache llvm +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 && ` + 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 + +# configure Python encoding +ENV PYTHONIOENCODING=UTF-8 + +# 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 +# to MSVC targets) and this directory contains executables named +# 'clang.exe' - add this last to let the other one have precedence. +# To use these compilers, use the triple prefixed form, e.g. +# x86_64-w64-mingw32-clang. +RUN powershell -Command ` + [System.Environment]::SetEnvironmentVariable('PATH', ` + [System.Environment]::GetEnvironmentVariable('PATH', 'machine') + ';C:\Program Files\Git\usr\bin;C:\llvm-mingw\bin', ` + 'machine') + +# support long file names during git checkout +RUN git config --system core.longpaths true & ` + git config --global core.autocrlf false + +# For debugging of files beeing locked by some processes. +RUN choco install -y handle +COPY start_agent.ps1 C:\scripts\ +COPY pre-checkout.bat c:\buildkite-agent\hooks\ +COPY post-checkout.bat c:\buildkite-agent\hooks\ +CMD ["powershell", "C:\\scripts\\start_agent.ps1"] \ No newline at end of file diff --git a/containers/buildkite-premerge-windows/post-checkout.bat b/containers/buildkite-premerge-windows/post-checkout.bat new file mode 100644 index 0000000..1825249 --- /dev/null +++ b/containers/buildkite-premerge-windows/post-checkout.bat @@ -0,0 +1,2 @@ +echo "post-checkout" +powershell c:\llvm-premerge-checks\scripts\windows\post-checkout.ps1 diff --git a/containers/buildkite-premerge-windows/pre-checkout.bat b/containers/buildkite-premerge-windows/pre-checkout.bat new file mode 100644 index 0000000..ff6f06e --- /dev/null +++ b/containers/buildkite-premerge-windows/pre-checkout.bat @@ -0,0 +1,5 @@ +echo "pre-checkout: update scripts" +cd c:\llvm-premerge-checks +git pull +git rev-parse HEAD +powershell c:\llvm-premerge-checks\scripts\windows\pre-checkout.ps1 \ No newline at end of file diff --git a/containers/buildkite-premerge-windows/start_agent.ps1 b/containers/buildkite-premerge-windows/start_agent.ps1 new file mode 100644 index 0000000..6a1b3e1 --- /dev/null +++ b/containers/buildkite-premerge-windows/start_agent.ps1 @@ -0,0 +1,11 @@ +git clone https://github.com/google/llvm-premerge-checks.git c:\llvm-premerge-checks +New-Item c:\ws -Force -ItemType Directory +$env:BUILDKITE_BUILD_PATH = "c:\ws" + +# Install Buildkite agent. +iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/buildkite/agent/master/install.ps1')) +$env:SCCACHE_DIR="C:\ws\sccache" +$env:SCCACHE_IDLE_TIMEOUT="0" +Remove-Item -Recurse -Force -ErrorAction Ignore $env:SCCACHE_DIR +sccache --start-server +C:\buildkite-agent\bin\buildkite-agent.exe start diff --git a/scripts/windows_agent_start_buildkite.ps1 b/scripts/windows_agent_start_buildkite.ps1 index ecc216b..f3c3bdf 100644 --- a/scripts/windows_agent_start_buildkite.ps1 +++ b/scripts/windows_agent_start_buildkite.ps1 @@ -21,6 +21,8 @@ param( [string]$workdir = "c:\ws" ) +New-Item $workdir -Force -ItemType Directorys + cd c:\llvm-premerge-checks git pull c:\llvm-premerge-checks\scripts\windows\start_container.ps1 -version $version -workdir $workdir