From ff91240ee55d57a1cf2c9f8e7e7cc122afd19b23 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Fri, 13 Oct 2023 22:30:22 +0200
Subject: [PATCH] prefix the logs with a marker for debug

---
 .forgejo/workflows/integration.yml | 8 +++++---
 tests/run.sh                       | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml
index de8c5db..36a0568 100644
--- a/.forgejo/workflows/integration.yml
+++ b/.forgejo/workflows/integration.yml
@@ -17,12 +17,14 @@ jobs:
           image-version: 1.21.0-3-rc0
           lxc-ip-prefix: 10.1.15
 
-      - name: tests
+      - name: tests cascading-pr
         run: |
           runner_config=$(pwd)/tests/runner-config.yaml
           sed -i -e 's|file: .runner|file: ${{ steps.forgejo.outputs.runner-file }}|' $runner_config
           FORGEJO_RUNNER_CONFIG=$runner_config forgejo-runner.sh reload
-          if ! tests/run.sh --host_port ${{ steps.forgejo.outputs.host-port }} --url ${{ steps.forgejo.outputs.url }} --token ${{ steps.forgejo.outputs.token }} ; then
-             cat ${{ steps.forgejo.outputs.runner-logs }}
+          if ! tests/run.sh --debug --host_port ${{ steps.forgejo.outputs.host-port }} --url ${{ steps.forgejo.outputs.url }} --token ${{ steps.forgejo.outputs.token }} ; then
+             sed -e 's/^/[RUNNER LOGS] /' ${{ steps.forgejo.outputs.runner-logs }}
+             docker logs forgejo | sed -e 's/^/[FORGEJO LOGS]/'
              exit 1
           fi
+          sleep 5 # hack to avoid mixing outputs in Forgejo v1.21
diff --git a/tests/run.sh b/tests/run.sh
index 264eae2..0249b67 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -5,6 +5,7 @@ set -e
 
 SELF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 TMPDIR=/tmp/cascading-pr-test
+mkdir -p $TMPDIR
 source $SELF_DIR/../cascading-pr-lib.sh
 
 function push_self() {