From bb4317e545759d8c04ca20447764858a5e323b12 Mon Sep 17 00:00:00 2001
From: Paulo Matos <pmatos@linki.tools>
Date: Thu, 28 May 2020 14:19:50 +0200
Subject: [PATCH] Improve Windows CI Testing (#3220)

Build and Test 3m and CS under Windows 10

This improves testing considerably on Windows.
For both PRs and Pushes, build 3m and CS on Windows and run tests.
---
 .github/workflows/ci-pr.yml                   | 39 -------------------
 .../workflows/{ci-push_win.yml => ci_win.yml} | 27 +++++++++++--
 2 files changed, 23 insertions(+), 43 deletions(-)
 rename .github/workflows/{ci-push_win.yml => ci_win.yml} (73%)

diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index 852dc407a9..29b1136fe7 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -66,42 +66,3 @@ jobs:
         raco test -l tests/db/all-tests
         raco test -c tests/stxparse
         raco test -c tests/syntax
-
-  buildtest-win:
-    runs-on: windows-latest
-
-    # According to
-    # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/software-installed-on-github-hosted-runners#windows-server-2019
-    # VS2019 is what is installed in the hosted runners:
-    #   Version: VisualStudio/16.3.6+29418.71
-    #   Location: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      working-directory: .\racket\src\worksp
-      shell: cmd
-      run: |
-        call msvcprep.bat x86_amd64
-        call build.bat
-        call ..\..\racket.exe csbuild.rkt
-        ..\..\raco.exe pkg install --auto --no-docs racket-test unstable-flonum-lib net-test
-    - name: Test
-      shell: cmd
-      run: |
-        call racket\raco.exe test -l tests/racket/test
-        call racket\racket.exe -l tests/racket/contract/all
-        call racket\raco.exe test -l tests/json/json
-        call racket\raco.exe test -l tests/file/main
-        call racket\raco.exe test -l tests/net/head
-        call racket\raco.exe test -l tests/net/uri-codec
-        call racket\raco.exe test -l tests/net/url
-        call racket\raco.exe test -l tests/net/url-port
-        call racket\raco.exe test -l tests/net/encoders
-        call racket\raco.exe test -l tests/openssl/basic
-        call racket\raco.exe test -l tests/openssl/https
-        call racket\raco.exe test -l tests/match/main
-        call racket\raco.exe test -l tests/zo-path
-        call racket\raco.exe test -c tests/xml
-        call racket\raco.exe test -c tests/future
-        call racket\raco.exe test -l tests/db/all-tests
-        racket\raco.exe test -c tests/stxparse
diff --git a/.github/workflows/ci-push_win.yml b/.github/workflows/ci_win.yml
similarity index 73%
rename from .github/workflows/ci-push_win.yml
rename to .github/workflows/ci_win.yml
index 9c9cc5bd43..4ed8ac2805 100644
--- a/.github/workflows/ci-push_win.yml
+++ b/.github/workflows/ci_win.yml
@@ -1,6 +1,6 @@
 name: CI Win
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   
@@ -10,6 +10,11 @@ jobs:
   buildtest-win:
     runs-on: windows-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        mode: ['3m', 'CS']
+    
     # According to
     # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/software-installed-on-github-hosted-runners#windows-server-2019
     # VS2019 is what is installed in the hosted runners:
@@ -17,14 +22,28 @@ jobs:
     #   Location: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise
     steps:
     - uses: actions/checkout@v2
-    - name: Build
+    - name: Build 3m
       working-directory: .\racket\src\worksp
+      if: matrix.mode == '3m'
       shell: cmd
       run: |
         call msvcprep.bat x86_amd64
         call build.bat
-        call ..\..\racket.exe csbuild.rkt -- --recurse-submodules --depth=1
-        ..\..\raco.exe pkg install --auto --no-docs racket-test unstable-flonum-lib net-test
+    - name: Build CS
+      working-directory: .\racket\src\worksp
+      if: matrix.mode == 'CS'
+      shell: cmd
+      run: |
+        call msvcprep.bat x86_amd64
+        call build-cs.bat
+    - name: Check reported racket version
+      shell: cmd
+      run: |
+        call racket\racket.exe --version
+    - name: Install Testing Deps
+      shell: cmd
+      run: |
+        call racket\raco.exe pkg install --auto --no-docs racket-test unstable-flonum-lib net-test
     - name: Test
       shell: cmd
       run: |