ang-x86-ninja removed MSVC environment setup
diff --git a/buildbot/google/docker/buildbot-windows10-vs2019/Dockerfile b/buildbot/google/docker/buildbot-windows10-vs2019/Dockerfile
index 60a8281..b19884a 100644
--- a/buildbot/google/docker/buildbot-windows10-vs2019/Dockerfile
+++ b/buildbot/google/docker/buildbot-windows10-vs2019/Dockerfile
@@ -1,5 +1,5 @@
# escape=`
-FROM gcr.io/sanitizer-bots/windows-base-vscode2019:7
+FROM gcr.io/sanitizer-bots/windows-base-vscode2019:8
ENV WORKER_NAME=windows10-vs2019
@@ -16,8 +16,5 @@
VOLUME C:\volumes\buildbot
# Configure 32bit tools ("x86") instead of 64bit ("amd64")
-ENTRYPOINT ["C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat", "-arch=x86", `
- "-host_arch=amd64", "&&", "powershell.exe", "-NoLogo", `
- "-ExecutionPolicy", "Bypass"]
-
-CMD ["c:\\buildbot\\run.ps1"]
+CMD ["powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass", `
+ "c:\\buildbot\\run.ps1"]
diff --git a/buildbot/google/docker/buildbot-windows10-vs2019/VERSION b/buildbot/google/docker/buildbot-windows10-vs2019/VERSION
index 48082f7..8351c19 100644
--- a/buildbot/google/docker/buildbot-windows10-vs2019/VERSION
+++ b/buildbot/google/docker/buildbot-windows10-vs2019/VERSION
@@ -1 +1 @@
-12
+14
diff --git a/buildbot/google/docker/windows-base-vscode2019/Dockerfile b/buildbot/google/docker/windows-base-vscode2019/Dockerfile
index 9ad3fcd..0457021 100644
--- a/buildbot/google/docker/windows-base-vscode2019/Dockerfile
+++ b/buildbot/google/docker/windows-base-vscode2019/Dockerfile
@@ -80,11 +80,3 @@
RUN git config --system core.longpaths true & `
git config --global core.autocrlf false
-# Define the entry point for the docker container.
-# This entry point starts the developer command prompt and launches the PowerShell shell.
-#
-# For running manually:
-# C:\BuildTools\Common7\Tools\VsDevCmd.bat -arch=amd64 -host_arch=amd64
-ENTRYPOINT ["C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat", "-arch=amd64", `
- "-host_arch=amd64", "&&", "powershell.exe", "-NoLogo", `
- "-ExecutionPolicy", "Bypass"]
diff --git a/buildbot/google/docker/windows-base-vscode2019/VERSION b/buildbot/google/docker/windows-base-vscode2019/VERSION
index 7f8f011..45a4fb7 100644
--- a/buildbot/google/docker/windows-base-vscode2019/VERSION
+++ b/buildbot/google/docker/windows-base-vscode2019/VERSION
@@ -1 +1 @@
-7
+8
diff --git a/buildbot/google/terraform/main.tf b/buildbot/google/terraform/main.tf
index 00cb3ba..c2eb6de 100644
--- a/buildbot/google/terraform/main.tf
+++ b/buildbot/google/terraform/main.tf
@@ -205,7 +205,7 @@
spec {
container {
- image = "${var.gcp_config.gcr_prefix}/buildbot-windows10-vs2019:12"
+ image = "${var.gcp_config.gcr_prefix}/buildbot-windows10-vs2019:14"
name = "windows10-vs2019"
# reserve "<number of cores>-1" for this image, kubernetes also
