Skip to content

Commit

Permalink
VS 2022 (#30)
Browse files Browse the repository at this point in the history
  • Loading branch information
fkorotkov authored Jun 23, 2022
1 parent cf60d10 commit 41b4e03
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ windows_docker_builder:
- docker info
pull_script: docker pull mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019
build_core_script: docker build -m 2GB --tag cirrusci/windowsservercore:2019 --tag cirrusci/windowsservercore:2019-%CIRRUS_TAG% windowsservercore
build_visualstudio_script: docker build -m 2GB --tag cirrusci/windowsservercore:visualstudio2019 --tag cirrusci/windowsservercore:visualstudio2019-%CIRRUS_TAG% contrib/visualstudio2019
build_visualstudio_script: docker build -m 2GB --tag cirrusci/windowsservercore:visualstudio2022 --tag cirrusci/windowsservercore:visualstudio2022-%CIRRUS_TAG% contrib/visualstudio2022
build_cmake_script: docker build -m 2GB --tag cirrusci/windowsservercore:cmake --tag cirrusci/windowsservercore:cmake-%CIRRUS_TAG% contrib/cmake
matrix:
- name: Push
Expand Down
2 changes: 1 addition & 1 deletion contrib/cmake/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# !IMPORTANT!
# * Pass -m 2GB (or more) when building the image.
# * Configure Docker to use disks larger than the default 20 GB.
FROM cirrusci/windowsservercore:visualstudio2019
FROM cirrusci/windowsservercore:visualstudio2022

RUN powershell -NoLogo -NoProfile -Command \
choco install -y --no-progress cmake --install-arguments="ADD_CMAKE_TO_PATH=System" ; \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ FROM cirrusci/windowsservercore:2019

RUN powershell -NoLogo -NoProfile -Command \
choco feature disable -n=usePackageExitCodes ; \
choco install -y --no-progress visualstudio2019buildtools ; \
choco install -y --no-progress visualstudio2022buildtools ; \
Remove-Item C:\ProgramData\chocolatey\logs\* -Force -Recurse ; \
Remove-Item $Env:localappdata\Nuget\Cache\*nupkg ; \
Remove-Item $Env:temp\* -Force -Recurse

RUN powershell -NoLogo -NoProfile -Command \
choco feature disable -n=usePackageExitCodes ; \
choco install -y --no-progress visualstudio2019-workload-vctools --package-parameters "--includeOptional" ; \
choco install -y --no-progress visualstudio2022-workload-vctools --package-parameters "--includeOptional" ; \
Remove-Item C:\ProgramData\chocolatey\logs\* -Force -Recurse ; \
Remove-Item $Env:localappdata\Nuget\Cache\*nupkg ; \
Remove-Item $Env:temp\* -Force -Recurse
2 changes: 1 addition & 1 deletion push_docker.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@echo off

docker history cirrusci/windowsservercore:2019
docker history cirrusci/windowsservercore:visualstudio2019
docker history cirrusci/windowsservercore:visualstudio2022
docker history cirrusci/windowsservercore:cmake

IF "%CIRRUS_TAG%" == "" GOTO NOTTAG
Expand Down

0 comments on commit 41b4e03

Please sign in to comment.