combine workflows

bmacnaughton · Nov 29, 2023 · f8e45ce · f8e45ce
1 parent aa6b519
commit f8e45ce
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/.github/workflows/commit-test.yml b/.github/workflows/commit-test.yml
@@ -4,10 +4,12 @@ on:
   push:
     branches-ignore:
       - test/**
+  pull_request:
+    branches-ignore:
+      - test/**
 
 jobs:
-  basic-tests:
-    if: github.event_name != 'pull_request'
+  linux-test:
     runs-on: ubuntu-latest
 
     strategy:
@@ -22,3 +24,22 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: npm install
       - run: npm test
+
+  other-os-tests:
+    if: github.event_name == 'pull_request'
+    needs: linux-test
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        node-version: [18.x, 20.x, 21.x]
+        os: [windows-latest, macos-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Testing node v${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm install
+      - run: npm test