From cef12b65951c99ede859dca0d9e4e210efe1b117 Mon Sep 17 00:00:00 2001
From: Josh Humphries <j.humphries@nhm.ac.uk>
Date: Wed, 20 Sep 2023 16:46:04 +0100
Subject: [PATCH] ci: switch back to a single workflow test file but with
 multiple jobs

---
 .../workflows/{test_latest.yml => main.yml}   | 17 ++++++++++++++++-
 .github/workflows/test_next.yml               | 19 -------------------
 2 files changed, 16 insertions(+), 20 deletions(-)
 rename .github/workflows/{test_latest.yml => main.yml} (51%)
 delete mode 100644 .github/workflows/test_next.yml

diff --git a/.github/workflows/test_latest.yml b/.github/workflows/main.yml
similarity index 51%
rename from .github/workflows/test_latest.yml
rename to .github/workflows/main.yml
index 8e7af78..32a454c 100644
--- a/.github/workflows/test_latest.yml
+++ b/.github/workflows/main.yml
@@ -5,7 +5,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  test:
+  test_latest:
+    name: Run tests against ckantest latest
     runs-on: ubuntu-latest
 
     steps:
@@ -19,3 +20,17 @@ jobs:
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
         run: docker-compose run -e COVERALLS_REPO_TOKEN latest bash /opt/scripts/run-tests.sh -c ckanext.doi
+
+  test_next:
+    name: Run tests against ckantest next
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v3
+
+      - name: Build images
+        run: docker-compose build
+
+      - name: Run tests against next
+        run: docker-compose run -e COVERALLS_REPO_TOKEN next bash /opt/scripts/run-tests.sh -c ckanext.doi
diff --git a/.github/workflows/test_next.yml b/.github/workflows/test_next.yml
deleted file mode 100644
index da170ce..0000000
--- a/.github/workflows/test_next.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Tests
-
-on:
-  push:
-  workflow_dispatch:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v3
-
-      - name: Build images
-        run: docker-compose build
-
-      - name: Run tests against next
-        run: docker-compose run -e COVERALLS_REPO_TOKEN next bash /opt/scripts/run-tests.sh -c ckanext.doi