From a4b744940890c9fb8921df4cc2f98715d2788906 Mon Sep 17 00:00:00 2001
From: Erica Pisani <pisani.erica@gmail.com>
Date: Tue, 9 Jan 2024 11:05:35 -0500
Subject: [PATCH] test: separate windows tests into another job (#6289)

* test: separate windows tests into another job

this will allow us to up the timeout time for that alone
without affecting the ubuntu and macos tests

* chore: remove outdated comments

windows tests are being re-added in this PR

* chore: rename e2e test for linux-based ones

they're not being picked up correctly and they're required

* chore: remove installation of pnpm

we weren't using it

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 .github/workflows/e2e-tests.yml | 59 ++++++++++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 5c9d41ae17d..bb5f6efd04f 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -10,19 +10,62 @@ on:
     - cron: '0 1 * * *' # At 01:00 daily
 
 jobs:
-  e2e:
-    name: E2E
+  e2e-windows:
+    name: E2E Windows tests
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     env:
       DEBUG: true
     strategy:
       matrix:
-        # TODO: E2E tests started failing on Windows. We should investigate the
-        # root cause and add Windows back to the OS matrix:
-        # https://github.com/netlify/cli/pull/6039
-        #
-        # os: [ubuntu-latest, macOS-latest, windows-latest]
+        os: [windows-latest]
+        node-version: ['18.14.0', '*']
+      fail-fast: false
+
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: npm
+          check-latest: true
+      - name: Cache verdaccio storage
+        uses: actions/cache@v3
+        with:
+          path: ./.verdaccio-storage
+          key: verdaccio-e2e-cli-${{ hashFiles('./package-lock.json') }}
+      - name: Install dependencies
+        run: npm ci --no-audit
+      - run: npm run e2e
+      - name: Notify Slack
+        uses: 8398a7/action-slack@v3
+        if: ${{ github.event_name == 'schedule' && failure() }}
+        with:
+          status: custom
+          fields: workflow
+          custom_payload: |
+            {
+              attachments: [{
+                title: 'E2E Test Failed! (${{ matrix.os }},node-${{ matrix.node-version }}',
+                color: 'danger',
+                text: `${process.env.AS_WORKFLOW}\n\nEither something broke or a test is flaky.\n\nConsider doing something about it :fire_engine:`,
+              }]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+  e2e-linux-based-os:
+    name: E2E
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 10
+    env:
+      DEBUG: true
+    strategy:
+      matrix:
         os: [ubuntu-latest, macOS-latest]
         node-version: ['18.14.0', '*']
       fail-fast: false
@@ -45,8 +88,6 @@ jobs:
           key: verdaccio-e2e-cli-${{ hashFiles('./package-lock.json') }}
       - name: Install dependencies
         run: npm ci --no-audit
-      - name: Install pnpm
-        run: npm install -g pnpm
       - run: npm run e2e
       - name: Notify Slack
         uses: 8398a7/action-slack@v3