From db4567599b3468f9331c2b75cc3c60156ca72f2b Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 19 Aug 2023 15:28:44 -0700
Subject: [PATCH] Make GH actions strategy more concise

---
 .github/workflows/ci.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 491f6a7956..eaf22d6732 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,9 +73,9 @@ jobs:
     needs: build
     strategy:
       matrix:
-        node-version: [16.x, 18.x]
-        runs-on: [ubuntu-latest, macos-latest, windows-latest]
-    runs-on: ${{ matrix.runs-on }}
+        node-version: [16, 18]
+        runs-on: [ubuntu, macos, windows]
+    runs-on: ${{ matrix.runs-on }}-latest
     steps:
     - uses: actions/checkout@v3
     - uses: actions/download-artifact@v3
@@ -89,10 +89,10 @@ jobs:
       run: 7z x compressed-build.zip -aoa -o${{ github.workspace }}
     - name: Print directory structure
       run: ls -R
-    - name: Use Node.js ${{ matrix.node-version }}
+    - name: Use Node.js ${{ matrix.node-version }}.x
       uses: actions/setup-node@v3
       with:
-        node-version: ${{ matrix.node-version }}
+        node-version: ${{ matrix.node-version }}.x
         cache: 'yarn'
     - name: Install dependencies
       run: yarn --frozen-lockfile
@@ -103,10 +103,10 @@ jobs:
     needs: build
     strategy:
       matrix:
-        node-version: [18.x]
-        runs-on: [ubuntu-latest, windows-latest] # macos-latest is flaky
+        node-version: [18]
+        runs-on: [ubuntu, windows] # macos is flaky
         browser: [chromium, firefox]
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ${{ matrix.runs-on }}-latest
     steps:
     - uses: actions/checkout@v3
     - uses: actions/download-artifact@v3
@@ -120,10 +120,10 @@ jobs:
       run: 7z x compressed-build.zip -aoa -o${{ github.workspace }}
     - name: Print directory structure
       run: ls -R
-    - name: Use Node.js ${{ matrix.node-version }}
+    - name: Use Node.js ${{ matrix.node-version }}.x
       uses: actions/setup-node@v3
       with:
-        node-version: ${{ matrix.node-version }}
+        node-version: ${{ matrix.node-version }}.x
         cache: 'yarn'
     - name: Install dependencies
       run: yarn --frozen-lockfile