From 6b20f85d7107e416e1c087e3d432724d1c85ad58 Mon Sep 17 00:00:00 2001
From: Irina Shestak <shestak.irina@gmail.com>
Date: Mon, 29 Jun 2020 15:18:15 +0200
Subject: [PATCH 1/4] run regular tests for cygwin build

---
 .evergreen.yml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index 09244cc6e2..04d236b6bc 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -95,15 +95,6 @@ functions:
           source .evergreen/.setup_env
           export EVERGREEN_EXPANSIONS_PATH="$(pwd)/../tmp/expansions.yaml"
           npm run test-ci
-  test_cygwin:
-    - command: shell.exec
-      params:
-        working_dir: src
-        shell: bash
-        script: |
-          set -e
-          source .evergreen/.setup_env
-          npm run test-ci
   test_ps:
     - command: expansions.write
       params:
@@ -160,11 +151,6 @@ tasks:
       - func: checkout
       - func: install
       - func: test
-  - name: test_cygwin
-    commands:
-      - func: checkout
-      - func: install
-      - func: test_cygwin
   - name: test_ps
     commands:
       - func: checkout
@@ -210,11 +196,11 @@ buildvariants:
       - name: test
       - name: release_linux
   - name: windows
-    display_name: "Windows VS 2019 Cygwin"
+    display_name: "Windows VS 2019"
     run_on: windows-64-vs2019-test
     tasks:
       - name: check
-      - name: test_cygwin
+      - name: test
   - name: windows_ps
     display_name: "Windows VS 2019 PowerShell"
     run_on: windows-64-vs2019-test

From 066fab2ce5260dbd529aeafe4b65e4930373c478 Mon Sep 17 00:00:00 2001
From: Irina Shestak <shestak.irina@gmail.com>
Date: Mon, 29 Jun 2020 15:23:50 +0200
Subject: [PATCH 2/4] only use powershell for windows builds

---
 .evergreen.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index 04d236b6bc..5d11a8ff73 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -195,17 +195,12 @@ buildvariants:
       - name: check
       - name: test
       - name: release_linux
-  - name: windows
-    display_name: "Windows VS 2019"
-    run_on: windows-64-vs2019-test
-    tasks:
-      - name: check
-      - name: test
   - name: windows_ps
     display_name: "Windows VS 2019 PowerShell"
     run_on: windows-64-vs2019-test
     tasks:
       - name: check_ps
+      - name: test
       - name: release_win_ps
 #  - name: ubuntuppc
 #    display_name: "Ubuntu 18.04 PPC"

From f069488ef3f10b2a3188ec6be0dd58e572385c55 Mon Sep 17 00:00:00 2001
From: Irina Shestak <shestak.irina@gmail.com>
Date: Mon, 29 Jun 2020 15:31:56 +0200
Subject: [PATCH 3/4] use windows specific test task

---
 .evergreen.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index 5d11a8ff73..0c33076305 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -200,7 +200,7 @@ buildvariants:
     run_on: windows-64-vs2019-test
     tasks:
       - name: check_ps
-      - name: test
+      - name: test_ps
       - name: release_win_ps
 #  - name: ubuntuppc
 #    display_name: "Ubuntu 18.04 PPC"

From 5916ba4341592e7c565a461a041dd1e65e0429bb Mon Sep 17 00:00:00 2001
From: Irina Shestak <shestak.irina@gmail.com>
Date: Mon, 29 Jun 2020 15:58:49 +0200
Subject: [PATCH 4/4] turn off testing on windows since we can't release unless
 tests pass

---
 .evergreen.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index 0c33076305..930b8886fb 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -200,7 +200,7 @@ buildvariants:
     run_on: windows-64-vs2019-test
     tasks:
       - name: check_ps
-      - name: test_ps
+      # - name: test_ps
       - name: release_win_ps
 #  - name: ubuntuppc
 #    display_name: "Ubuntu 18.04 PPC"