From 2c4a1d43beeb359eee0c40366cb90907f4760a52 Mon Sep 17 00:00:00 2001 From: Merith Date: Thu, 26 Sep 2024 07:28:00 -0700 Subject: [PATCH] revert changes to workflow --- .forgejo/workflows/example-docker-compose.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/example-docker-compose.yml b/.forgejo/workflows/example-docker-compose.yml index 2a18988..f1089ec 100644 --- a/.forgejo/workflows/example-docker-compose.yml +++ b/.forgejo/workflows/example-docker-compose.yml @@ -39,11 +39,8 @@ jobs: # Launch Forgejo & the runner # $cli up -d - for delay in $(seq 60) ; do - test -f ./forgejo-runner/runner.json && break - sleep 30 - done - test -f ./forgejo-runner/runner.json + for delay in $(seq 60) ; do test -f /srv/runner-data/.runner && break ; sleep 30 ; done + test -f /srv/runner-data/.runner # # Run the demo workflow # @@ -59,15 +56,15 @@ jobs: grep --quiet "$success" /tmp/out && break grep --quiet "$failure" /tmp/out && break $cli ps --all - $cli logs --tail=20 forgejo-runner demo-workflow + $cli logs --tail=20 runner-daemon demo-workflow sleep 30 done grep --quiet "$success" /tmp/out - $cli logs forgejo-runner > /tmp/runner.log + $cli logs runner-daemon > /tmp/runner.log grep --quiet 'Start image=code.forgejo.org/oci/node:20-bookworm' /tmp/runner.log - name: full docker compose logs if: always() run: | cd examples/docker-compose - docker compose -f compose-forgejo-and-runner.yml -f compose-demo-workflow.yml logs + docker compose -f compose-forgejo-and-runner.yml -f compose-demo-workflow.yml logs \ No newline at end of file