From 2c3a2c1ff9e699e4d8e4cb8a004d5eb931f9aa72 Mon Sep 17 00:00:00 2001
From: Worive <13164341+Worive@users.noreply.github.com>
Date: Sun, 7 Jun 2026 18:33:30 +0200
Subject: [PATCH] Adjust Horizon-QA check to depend on server error test (#70)

---
 .github/workflows/build-and-test.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index cdb82f9..b74accd 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -215,19 +215,20 @@ jobs:
         chmod +x .gtnh-workflows/scripts/summarize_horizonqa_result
         .gtnh-workflows/scripts/summarize_horizonqa_result
 
-    - name: Test Horizon-QA result
-      if: ${{ always() && !inputs.client-only && inputs.horizonqa && steps.run_server.conclusion != 'skipped' }}
-      shell: bash
-      run: |
-        chmod +x .gtnh-workflows/scripts/test_horizonqa_result
-        .gtnh-workflows/scripts/test_horizonqa_result
-
     - name: Test no errors reported during server run
+      id: server_errors
       if: ${{ !inputs.client-only }}
       run: |
         chmod +x .gtnh-workflows/scripts/test_no_error_reports
         .gtnh-workflows/scripts/test_no_error_reports
 
+    - name: Test Horizon-QA result
+      if: ${{ always() && !inputs.client-only && inputs.horizonqa && steps.run_server.conclusion != 'skipped' && steps.server_errors.conclusion == 'success' }}
+      shell: bash
+      run: |
+        chmod +x .gtnh-workflows/scripts/test_horizonqa_result
+        .gtnh-workflows/scripts/test_horizonqa_result
+
     - name: Test no prerelease dependencies used
       run: |
         ! grep -P -- "-pre(?!shadow)" dependencies.gradle*