From d7630954bfbf6dc6cc220e517a8e0ee0cd5776b6 Mon Sep 17 00:00:00 2001
From: Joshua Smock <jo-sm@users.noreply.github.com>
Date: Mon, 20 Feb 2023 12:32:40 +0100
Subject: [PATCH] Link jest-preset-cljest so that tests work

- Consolidate workflow files for simplicity
---
 .github/workflows/cljest-tests.yml | 37 ------------------------------
 .github/workflows/tests.yml        | 30 ++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 39 deletions(-)
 delete mode 100644 .github/workflows/cljest-tests.yml

diff --git a/.github/workflows/cljest-tests.yml b/.github/workflows/cljest-tests.yml
deleted file mode 100644
index 82e6417..0000000
--- a/.github/workflows/cljest-tests.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Run cljest tests
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-  workflow_dispatch:
-
-concurrency:
-  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: cljest
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup java
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: '17'
-      - name: Setup Clojure
-        uses: DeLaGuardo/setup-clojure@9.5
-        with:
-          cli: 1.11.1.1224
-      - name: Install npm dependencies
-        run: npm install
-      - name: Build Jest code
-        run: clojure -X cljest.compilation/compile
-      - name: Run cljest tests
-        run: npm run jest:ci
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 69730ec..688e713 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,4 +1,4 @@
-name: "jest-preset-cljest: Lint and run tests"
+name: Lint and tests
 
 on:
   push:
@@ -12,7 +12,33 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  lint-and-test:
+  cljest-tests:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: cljest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+      - name: Setup Clojure
+        uses: DeLaGuardo/setup-clojure@9.5
+        with:
+          cli: 1.11.1.1224
+      - name: Link jest-preset-cljest
+        run: npm link ../jest-preset-cljest
+      - name: Install npm dependencies
+        run: npm install
+      - name: Build Jest code
+        run: clojure -X cljest.compilation/compile
+      - name: Run cljest tests
+        run: npm run jest:ci
+
+  jest-preset-cljest-tests:
     runs-on: ubuntu-latest
     defaults:
       run: