From 05f724cb4a3a8b1228c9e3085ed3a1dc410f12a9 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Sun, 30 Aug 2020 17:34:52 +0200
Subject: [PATCH] Disable Windows builds on the auto-tester - replace with
 Azure pipelines

---
 .azure-pipelines/windows-artifact.yml |  6 ++++
 .azure-pipelines/windows.yml          |  5 ----
 azure-pipelines.yml                   | 40 +++++++++++++++++++++++++--
 src/win32.mak                         |  5 ++--
 test/Makefile                         |  5 ++++
 5 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 .azure-pipelines/windows-artifact.yml

diff --git a/.azure-pipelines/windows-artifact.yml b/.azure-pipelines/windows-artifact.yml
new file mode 100644
index 0000000000..a742b9afd9
--- /dev/null
+++ b/.azure-pipelines/windows-artifact.yml
@@ -0,0 +1,6 @@
+steps:
+  - task: PublishPipelineArtifact@0
+    inputs:
+      artifactName: windows-$(ARCH)
+      targetPath: artifacts
+    displayName: Publish artifacts
diff --git a/.azure-pipelines/windows.yml b/.azure-pipelines/windows.yml
index 16cc506d69..20b3e4ca46 100644
--- a/.azure-pipelines/windows.yml
+++ b/.azure-pipelines/windows.yml
@@ -14,8 +14,3 @@ steps:
       bash --version
       sh --login .azure-pipelines/windows.sh
     displayName: Build DMD
-  - task: PublishPipelineArtifact@0
-    inputs:
-      artifactName: windows-$(ARCH)
-      targetPath: artifacts
-    displayName: Publish artifacts
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1fa61203e5..fe64e9ca24 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,12 +1,12 @@
 # Learn more: https://aka.ms/yaml
 jobs:
-  - job: Windows
+  - job: Windows_Bootstrap
     timeoutInMinutes: 120
     pool:
       vmImage: 'vs2017-win2016'
     variables:
       VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
-      HOST_DMD_VERSION: 2.092.1
+      HOST_DMD_VERSION: 2.079.0
     strategy:
       matrix:
         x64:
@@ -17,6 +17,41 @@ jobs:
     steps:
       - template: .azure-pipelines/windows.yml
 
+  - job: Windows
+    timeoutInMinutes: 120
+    pool:
+      vmImage: 'vs2017-win2016'
+    variables:
+      VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
+      HOST_DMD_VERSION: LATEST
+    strategy:
+      matrix:
+        x64:
+          OS: Win_64
+          MODEL: 64
+          ARCH: x64
+          D_COMPILER: dmd
+    steps:
+      - template: .azure-pipelines/windows.yml
+      - template: .azure-pipelines/windows-artifact.yml
+
+  - job: Windows_OMF_Bootstrap
+    timeoutInMinutes: 120
+    pool:
+      vmImage: 'vs2017-win2016'
+    variables:
+      VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
+      HOST_DMD_VERSION: 2.079.0
+    strategy:
+      matrix:
+        win32:
+          OS: Win_32
+          MODEL: 32
+          ARCH: x86
+          D_COMPILER: dmd
+    steps:
+      - template: .azure-pipelines/windows.yml
+
   - job: Windows_OMF
     timeoutInMinutes: 120
     pool:
@@ -33,6 +68,7 @@ jobs:
           D_COMPILER: dmd
     steps:
       - template: .azure-pipelines/windows.yml
+      - template: .azure-pipelines/windows-artifact.yml
 
   - job: Windows_VisualD
     timeoutInMinutes: 120
diff --git a/src/win32.mak b/src/win32.mak
index 2dd8524543..324d27d545 100644
--- a/src/win32.mak
+++ b/src/win32.mak
@@ -79,8 +79,9 @@ defaulttarget: $G debdmd
 
 # FIXME: Windows test suite uses src/dmd.exe instead of $(GENERATED)/dmd.exe
 auto-tester-build: $(GEN)\build.exe
-	$(RUN_BUILD) "ENABLE_RELEASE=1" "ENABLE_ASSERTS=1" $@
-	copy $(TARGETEXE) .
+	echo "Windows builds have been disabled"
+	#$(RUN_BUILD) "ENABLE_RELEASE=1" "ENABLE_ASSERTS=1" $@
+	#copy $(TARGETEXE) .
 
 dmd: $G reldmd
 
diff --git a/test/Makefile b/test/Makefile
index 82f306df1a..72ff2f402e 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -209,8 +209,13 @@ start_all_tests: $(RUNNER)
 	$(EXECUTE_RUNNER) all
 
 # The auto-tester cannot run runnable_cxx as its compiler is too old
+ifeq (windows,$(OS))
+auto-tester-test:
+	echo "Windows builds have been disabled"
+else
 auto-tester-test: $(RUNNER)
 	$(EXECUTE_RUNNER) runnable compilable fail_compilation dshell
+endif
 
 $(RESULTS_DIR)/d_do_test$(EXE): tools/d_do_test.d tools/sanitize_json.d $(RESULTS_DIR)/.created
 	@echo "Building d_do_test tool"