From 077271ca2ebb6e07cf2c0a59e5ae3bddf4e64f6f Mon Sep 17 00:00:00 2001
From: Saurtron <saurtron@riseup.net>
Date: Sat, 21 Dec 2024 15:31:48 +0100
Subject: [PATCH] Revert to just one job for "run tests" + "process test
 results".

---
 .github/workflows/test_and_deploy.yml | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
index b01413c982..95cd9b8a6c 100644
--- a/.github/workflows/test_and_deploy.yml
+++ b/.github/workflows/test_and_deploy.yml
@@ -23,23 +23,6 @@ jobs:
         run: docker compose -f tools/headless_testing/docker-compose.yml up
         timeout-minutes: 30
 
-      - name: Upload Test Results
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Test Results
-          path: tools/headless_testing/testlog/results.json
-
-  test-results:
-    name: Process Test Results
-    runs-on: ubuntu-latest
-    needs: run-tests
-    steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: artifacts
-
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
         with:
@@ -47,12 +30,12 @@ jobs:
           action_fail_on_inconclusive: true
           check_name: "Test Results"
           time_unit: milliseconds
-          files: "artifacts/Test Results/*.json"
+          files: "tools/headless_testing/testlog/results.json"
 
   deploy:
     name: Deploy
     runs-on: ubuntu-latest
-    needs: test-results
+    needs: run-tests
     if: |
       github.repository == 'beyond-all-reason/Beyond-All-Reason' &&
       github.event_name == 'push' &&