diff options
| author | Earl Warren <contact@earl-warren.org> | 2023-11-07 20:19:08 +0100 |
|---|---|---|
| committer | earl-warren <earl-warren@noreply.code.forgejo.org> | 2023-11-07 22:41:18 +0100 |
| commit | 6d77918ad1f0316f02fc761f49cc70e4628cf25b (patch) | |
| tree | ad5b96443c35cc50647d4be15e262f9a6ffced77 /.forgejo | |
| parent | [FORGEJO] upgrade to act v1.13.0 (diff) | |
| download | forgejo-runner-6d77918ad1f0316f02fc761f49cc70e4628cf25b.tar.xz forgejo-runner-6d77918ad1f0316f02fc761f49cc70e4628cf25b.zip | |
[FORGEJO] upgrade to act v1.13.0v3.0.3
Diffstat (limited to '.forgejo')
| -rw-r--r-- | .forgejo/workflows/example-docker-compose.yml | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/.forgejo/workflows/example-docker-compose.yml b/.forgejo/workflows/example-docker-compose.yml index ee71ca6..68d8052 100644 --- a/.forgejo/workflows/example-docker-compose.yml +++ b/.forgejo/workflows/example-docker-compose.yml @@ -3,7 +3,7 @@ on: push: branches: - 'main' - pull_request_target: + pull_request: jobs: example-docker-compose: @@ -34,7 +34,7 @@ jobs: cd examples/docker-compose secret=$(openssl rand -hex 20) sed -i -e "s/{SHARED_SECRET}/$secret/" compose-forgejo-and-runner.yml - cli="docker compose -f compose-forgejo-and-runner.yml -f compose-demo-workflow.yml" + cli="docker compose --progress quiet -f compose-forgejo-and-runner.yml -f compose-demo-workflow.yml" # # Launch # @@ -42,19 +42,21 @@ jobs: # # Wait for the demo workflow to complete # - $cli ps --help success='DEMO WORKFLOW SUCCESS' failure='DEMO WORKFLOW FAILURE' for delay in $(seq 60) ; do - $cli logs -n 10 demo-workflow > /tmp/out + $cli logs demo-workflow > /tmp/out grep --quiet "$success" /tmp/out && break grep --quiet "$failure" /tmp/out && break $cli ps --all tail /tmp/out sleep 10 done - if ! grep --quiet "$success" /tmp/out ; then - echo ========================================== - $cli logs - exit 1 - fi + tail /tmp/out + grep --quiet "$success" /tmp/out + + - name: docker compose logs + if: always() + run: | + cd examples/docker-compose + docker compose -f compose-forgejo-and-runner.yml -f compose-demo-workflow.yml logs |