From 21f00b7cbcec9bbc582f1afdd2b2f50eb2bfe176 Mon Sep 17 00:00:00 2001
From: bombcar <github@bombcar.com>
Date: Sat, 12 Feb 2022 09:13:41 -0600
Subject: [PATCH] fix scripts

---
 .github/scripts/test-no-error-reports.sh | 2 +-
 .github/workflows/build-and-test.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/test-no-error-reports.sh b/.github/scripts/test-no-error-reports.sh
index 22928fc..84c1e5d 100644
--- a/.github/scripts/test-no-error-reports.sh
+++ b/.github/scripts/test-no-error-reports.sh
@@ -22,7 +22,7 @@ if grep --quiet "The state engine was in incorrect state ERRORED and forced into
   exit 1
 fi
 
-if ! grep --quiet -Po -v '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
+if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
   echo "Server didn't finish startup:"
   cat server.log
   exit 1
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index babc23b..2a74327 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -37,7 +37,7 @@ jobs:
       run: |
         mkdir run
         echo "eula=true" > run/eula.txt
-        timeout 90 ./gradlew runServer | tee -a server.log
+        timeout 90 ./gradlew runServer 2>&1 | tee -a server.log || true
 
     - name: Test no errors reported during server run
       run: |