From 2e3b17659e8856696acfe3015631ce2989eb3084 Mon Sep 17 00:00:00 2001
From: dcode <dcode@dcode.io>
Date: Thu, 13 Feb 2025 10:34:27 +0100
Subject: [PATCH] Merge lint and test workflows

---
 .github/workflows/lint.yml | 23 -----------------------
 .github/workflows/test.yml | 12 +++++++++++-
 2 files changed, 11 insertions(+), 24 deletions(-)
 delete mode 100644 .github/workflows/lint.yml

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
deleted file mode 100644
index 57db73d..0000000
--- a/.github/workflows/lint.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Lint
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-  workflow_dispatch:
-jobs:
-  test:
-    name: Test
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node_version: ["current"]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node_version }}
-      - name: Install dependencies
-        run: npm ci --no-audit
-      - name: Lint
-        run: npm run lint
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2fbc75e..dba6bb3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,8 +6,18 @@ on:
   pull_request:
   workflow_dispatch:
 jobs:
+  lint:
+    name: Check formatting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+      - name: Install dependencies
+        run: npm ci --no-audit
+      - name: Lint
+        run: npm run lint
   test:
-    name: Test
+    name: Build and test
     runs-on: ubuntu-latest
     strategy:
       matrix: