From e022c99d4566972a384942a8e3ceebb7846dd673 Mon Sep 17 00:00:00 2001
From: Timmy Willison <timmywil@users.noreply.github.com>
Date: Tue, 11 Jun 2024 19:47:23 -0400
Subject: [PATCH] Tests: conslidate GH actions runs; separate git & stable
 jQuery versions

- also add hard retries to runs
- remove legacy build on Node 10

Closes gh-2262
---
 .github/workflows/node.js.yml | 85 ++++++++++++++---------------------
 1 file changed, 33 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index af7c7334e..edb67e9eb 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -17,17 +17,17 @@ env:
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
-    name: ${{ matrix.BROWSER }} - jQuery ${{ matrix.JQUERY }}
+    name: |
+      ${{ matrix.BROWSER }} | ${{ matrix.JQUERYS.name }}
     strategy:
       fail-fast: false
       matrix:
         BROWSER: [chrome, firefox]
-        JQUERY:
-          - "git"
-          - "3.x-git"
-          - "3.7.1"
-          - "2.2.4"
-          - "1.12.4"
+        JQUERYS:
+          - versions: --jquery git --jquery 3.x-git
+            name: jQuery git
+          - versions: --jquery 3.7.1 --jquery 3.6.4 --jquery 2.2.4 --jquery 1.12.4
+            name: jQuery stable
 
     steps:
       - name: Checkout
@@ -56,20 +56,23 @@ jobs:
         run: npm run build
 
       - name: Test
-        run: npm run test:unit -- -h -b ${{ matrix.BROWSER }} --jquery ${{ matrix.JQUERY }} --retries 3
+        run: |
+          npm run test:unit -- -h -b ${{ matrix.BROWSER }} \
+            ${{ matrix.JQUERYS.versions }} \
+            --retries 3 --hard-retries 1
 
   edge:
     runs-on: windows-latest
-    name: edge - jQuery ${{ matrix.JQUERY }}
+    name: |
+      edge | ${{ matrix.JQUERYS.name }}
     strategy:
       fail-fast: false
       matrix:
-        JQUERY:
-          - "git"
-          - "3.x-git"
-          - "3.7.1"
-          - "2.2.4"
-          - "1.12.4"
+        JQUERYS:
+          - versions: --jquery git --jquery 3.x-git
+            name: jQuery git
+          - versions: --jquery 3.7.1 --jquery 3.6.4 --jquery 2.2.4 --jquery 1.12.4
+            name: jQuery stable
     steps:
       - name: Checkout
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
@@ -94,20 +97,23 @@ jobs:
         run: npm run build
 
       - name: Test
-        run: npm run test:unit -- -h -b edge --jquery ${{ matrix.JQUERY }} --retries 3
+        run: |
+          npm run test:unit -- -h -b edge `
+            ${{ matrix.JQUERYS.versions }} `
+            --retries 3 --hard-retries 1
 
   safari:
     runs-on: macos-latest
-    name: safari - jQuery ${{ matrix.JQUERY }}
+    name: |
+      safari | ${{ matrix.JQUERYS.name }}
     strategy:
       fail-fast: false
       matrix:
-        JQUERY:
-          - "git"
-          - "3.x-git"
-          - "3.7.1"
-          - "2.2.4"
-          - "1.12.4"
+        JQUERYS:
+          - versions: --jquery git --jquery 3.x-git
+            name: jQuery git
+          - versions: --jquery 3.7.1 --jquery 3.6.4 --jquery 2.2.4 --jquery 1.12.4
+            name: jQuery stable
     steps:
       - name: Checkout
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
@@ -132,32 +138,7 @@ jobs:
         run: npm run build
 
       - name: Test
-        run: npm run test:unit -- -b safari --jquery ${{ matrix.JQUERY }} --retries 3
-
-  legacy-build:
-    runs-on: ubuntu-latest
-    name: Build on Node 10.x
-    env:
-      NODE_VERSION: 10.x
-    steps:
-      - name: Checkout
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-
-      - name: Cache
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-
-
-      - name: Install npm dependencies
-        run: npm install
-
-      - name: Build
-        run: npm run build
+        run: |
+          npm run test:unit -- -b safari \
+            ${{ matrix.JQUERYS.versions }} \
+            --retries 3 --hard-retries 1
-- 
2.39.5