From 5a2e9385b0bda7fa489077e7c6e70e4d890ec0aa Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 1 Nov 2023 17:28:44 +0100 Subject: [PATCH] move the runner & forgejo test logs to a different step --- .forgejo/workflows/integration.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml index c9eef3f..1701f08 100644 --- a/.forgejo/workflows/integration.yml +++ b/.forgejo/workflows/integration.yml @@ -26,9 +26,10 @@ jobs: runner_config=/tmp/runner-config.yaml sed -e 's|file: .runner|file: ${{ steps.forgejo.outputs.runner-file }}|' < tests/runner-config.yaml > $runner_config FORGEJO_RUNNER_CONFIG=$runner_config forgejo-runner.sh reload - if ! tests/run.sh --verbose --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 + tests/run.sh --verbose --host_port ${{ steps.forgejo.outputs.host-port }} --url ${{ steps.forgejo.outputs.url }} --token ${{ steps.forgejo.outputs.token }} + + - name: full logs + run: | + sed -e 's/^/[RUNNER LOGS] /' ${{ steps.forgejo.outputs.runner-logs }} + docker logs forgejo | sed -e 's/^/[FORGEJO LOGS]/' sleep 5 # hack to avoid mixing outputs in Forgejo v1.21