From f2a3954ce3f3c89a464cc36eafa8c72e2b821c32 Mon Sep 17 00:00:00 2001 From: Steven Koo Date: Wed, 17 Mar 2021 13:53:16 -0500 Subject: ci: install vc_buildtools instead of vc_community For our build machines, we don't need full on Visual Studio. Instead this installs the VS Build Tools, which has the CLI build apps we need. Signed-off-by: Steven Koo --- .ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile | 8 ++++---- .ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile | 8 ++++---- .ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile | 8 ++++---- .ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile | 8 ++++---- .ci/templates/steps-build-uhd-msbuild.yml | 2 +- .ci/uhd-build-docker-container.yml | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to '.ci') diff --git a/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile b/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile index 12e198139..b0b19350a 100644 --- a/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile +++ b/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile @@ -24,10 +24,10 @@ RUN choco install -y python3 --version=3.7.9 RUN pip install mako requests numpy ruamel.yaml RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \ - Invoke-WebRequest "https://aka.ms/vs/15/release/vs_community.exe" \ - -OutFile "%TEMP%\vs_community.exe" -UseBasicParsing -RUN "%TEMP%\vs_community.exe" --quiet --wait --norestart --noUpdateInstaller \ - --add Microsoft.VisualStudio.Workload.NativeDesktop \ + Invoke-WebRequest "https://aka.ms/vs/15/release/vs_buildtools.exe" \ + -OutFile "%TEMP%\vs_buildtools.exe" -UseBasicParsing +RUN "%TEMP%\vs_buildtools.exe" --quiet --wait --norestart --noUpdateInstaller \ + --add Microsoft.VisualStudio.Workload.VCTools \ --add Microsoft.VisualStudio.Component.Windows81SDK \ --includeRecommended diff --git a/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile b/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile index 6ef77132d..a6366756f 100644 --- a/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile +++ b/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile @@ -24,10 +24,10 @@ RUN choco install -y python3 --version=3.7.9 RUN pip install mako requests numpy ruamel.yaml RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \ - Invoke-WebRequest "https://aka.ms/vs/15/release/vs_community.exe" \ - -OutFile "%TEMP%\vs_community.exe" -UseBasicParsing -RUN "%TEMP%\vs_community.exe" --quiet --wait --norestart --noUpdateInstaller \ - --add Microsoft.VisualStudio.Workload.NativeDesktop \ + Invoke-WebRequest "https://aka.ms/vs/15/release/vs_buildtools.exe" \ + -OutFile "%TEMP%\vs_buildtools.exe" -UseBasicParsing +RUN "%TEMP%\vs_buildtools.exe" --quiet --wait --norestart --noUpdateInstaller \ + --add Microsoft.VisualStudio.Workload.VCTools \ --add Microsoft.VisualStudio.Component.Windows81SDK \ --includeRecommended diff --git a/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile b/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile index d10b87cac..7c4ff74e1 100644 --- a/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile +++ b/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile @@ -24,10 +24,10 @@ RUN choco install -y python3 --version=3.7.9 RUN pip install mako requests numpy ruamel.yaml RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \ - Invoke-WebRequest "https://aka.ms/vs/16/release/vs_community.exe" \ - -OutFile "%TEMP%\vs_community.exe" -UseBasicParsing -RUN "%TEMP%\vs_community.exe" --quiet --wait --norestart --noUpdateInstaller \ - --add Microsoft.VisualStudio.Workload.NativeDesktop \ + Invoke-WebRequest "https://aka.ms/vs/16/release/vs_buildtools.exe" \ + -OutFile "%TEMP%\vs_buildtools.exe" -UseBasicParsing +RUN "%TEMP%\vs_buildtools.exe" --quiet --wait --norestart --noUpdateInstaller \ + --add Microsoft.VisualStudio.Workload.VCTools \ --includeRecommended RUN setx VCPKG_INSTALL_DIR "c:\\vcpkg" /m diff --git a/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile b/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile index 87806af1e..8b4000f1c 100644 --- a/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile +++ b/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile @@ -24,10 +24,10 @@ RUN choco install -y python3 --version=3.7.9 RUN pip install mako requests numpy ruamel.yaml RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \ - Invoke-WebRequest "https://aka.ms/vs/16/release/vs_community.exe" \ - -OutFile "%TEMP%\vs_community.exe" -UseBasicParsing -RUN "%TEMP%\vs_community.exe" --quiet --wait --norestart --noUpdateInstaller \ - --add Microsoft.VisualStudio.Workload.NativeDesktop \ + Invoke-WebRequest "https://aka.ms/vs/16/release/vs_buildtools.exe" \ + -OutFile "%TEMP%\vs_buildtools.exe" -UseBasicParsing +RUN "%TEMP%\vs_buildtools.exe" --quiet --wait --norestart --noUpdateInstaller \ + --add Microsoft.VisualStudio.Workload.VCTools \ --includeRecommended RUN setx VCPKG_INSTALL_DIR "c:\\vcpkg" /m diff --git a/.ci/templates/steps-build-uhd-msbuild.yml b/.ci/templates/steps-build-uhd-msbuild.yml index d92ae88b6..3b2c6120d 100644 --- a/.ci/templates/steps-build-uhd-msbuild.yml +++ b/.ci/templates/steps-build-uhd-msbuild.yml @@ -23,7 +23,7 @@ steps: displayName: cmake msbuild UHD - script: | cd ${{ parameters.uhdBuildDir }} - call "C:\Program Files (x86)\Microsoft Visual Studio\$(vsYear)\Community\VC\Auxiliary\Build\vcvarsall.bat" $(vsArch) + call "C:\Program Files (x86)\Microsoft Visual Studio\$(vsYear)\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" $(vsArch) msbuild.exe ALL_BUILD.vcxproj /p:configuration=release displayName: msbuild UHD - script: | diff --git a/.ci/uhd-build-docker-container.yml b/.ci/uhd-build-docker-container.yml index ad66fd486..f674b4341 100644 --- a/.ci/uhd-build-docker-container.yml +++ b/.ci/uhd-build-docker-container.yml @@ -156,7 +156,7 @@ jobs: - script: | cd $(Build.BinariesDirectory) cd uhddev\build - "C:\Program Files (x86)\Microsoft Visual Studio\$(vsYear)\Community\VC\Auxiliary\Build\vcvarsall.bat" $(vsArch) + "C:\Program Files (x86)\Microsoft Visual Studio\$(vsYear)\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" $(vsArch) displayName: Load Visual C++ Env - job: export_build_number -- cgit v1.2.3