From 58059d0efac88c1ef49d82be01e91c31c46e540e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0t=C4=9Bp=C3=A1nek?= Date: Thu, 10 Jun 2021 09:25:22 +0200 Subject: [PATCH] Configure CI (no. 134) --- .azure/pipelines/ci.yml | 4 +++- ci/linux/Dockerfile | 15 --------------- ci/windows/Dockerfile | 30 ------------------------------ 3 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 ci/linux/Dockerfile delete mode 100644 ci/windows/Dockerfile diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 9972169d49..501794cc87 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -36,7 +36,9 @@ jobs: - job: testWindows displayName: Run tests on Windows - pool: DockerAgents + pool: + name: AdamovoPool + demands: Agent.OS -equals Windows_NT workspace: clean: all steps: diff --git a/ci/linux/Dockerfile b/ci/linux/Dockerfile deleted file mode 100644 index e708dba173..0000000000 --- a/ci/linux/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0 - -ENV \ - LANG=C.UTF-8 \ - LC_ALL=C.UTF-8 \ - DEBIAN_FRONTEND=noninteractive \ - DEBCONF_NONINTERACTIVE_SEEN=true - -RUN apt-get -q update \ - && apt-get -q install -y --no-install-recommends \ - npm \ - chromium \ - chromium-driver \ - xvfb \ - && apt-get -q clean diff --git a/ci/windows/Dockerfile b/ci/windows/Dockerfile deleted file mode 100644 index 707bfad93f..0000000000 --- a/ci/windows/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -# escape=` -FROM mcr.microsoft.com/dotnet/sdk:5.0 as dotnet-installer - - -# export fonts from full-windows (based on https://stackoverflow.com/a/65655141) -FROM mcr.microsoft.com/windows:20H2 as full-windows -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -RUN Copy-Item -Path C:\Windows\Fonts -Exclude lucon.ttf -Destination C:\tmp\fonts -Recurse; ` - New-Item -ItemType Directory -Force -Path C:\tmp\registries; ` - reg export 'HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts' C:\tmp\registries\Fonts.reg; ` - reg export 'HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontLink\SystemLink' C:\tmp\registries\FontLink.reg; - - -FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 - -# import fonts from full-windows -COPY --from=full-windows /tmp/fonts/ /Windows/Fonts/ -COPY --from=full-windows /tmp/registries/ /tmp/registries/ -RUN reg import C:\tmp\registries\Fonts.reg; reg import C:\tmp\registries\FontLink.reg; - -RUN Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1') - -RUN choco install -y googlechrome chromedriver - -COPY --from=dotnet-installer ["/Program Files/dotnet", "/Program Files/dotnet"] - -RUN setx /M PATH \"${env:PATH};C:\Program Files\dotnet\" -RUN dotnet help - -ENTRYPOINT []