examples/docker-compose: fix false positive

because of the -x the success string was always in the output and the
workflow .forgejo/workflows/example-docker-compose.yml would always
report success, even if it fails
pull/90/head
Earl Warren 2023-10-06 16:19:55 +02:00
parent bf11dac848
commit 9cb0716425
No known key found for this signature in database
GPG Key ID: 0579CB2928A78A00
3 changed files with 10 additions and 8 deletions

View File

@ -42,11 +42,13 @@ jobs:
# #
$cli ps --help $cli ps --help
success='DEMO WORKFLOW SUCCESS' success='DEMO WORKFLOW SUCCESS'
failure='DEMO WORKFLOW FAILURE'
for delay in $(seq 60) ; do for delay in $(seq 60) ; do
$cli logs -n 10 demo-workflow > /tmp/out $cli logs -n 10 demo-workflow > /tmp/out
grep --quiet "$success" /tmp/out && break grep --quiet "$success" /tmp/out && break
grep --quiet "$failure" /tmp/out && break
$cli ps --all $cli ps --all
cat /tmp/out tail /tmp/out
sleep 10 sleep 10
done done
if ! grep --quiet "$success" /tmp/out ; then if ! grep --quiet "$success" /tmp/out ; then

View File

@ -13,7 +13,7 @@ services:
runner-register: runner-register:
condition: service_completed_successfully condition: service_completed_successfully
command: >- command: >-
sh -xc ' sh -ec '
apk add --quiet git curl jq ; apk add --quiet git curl jq ;
mkdir -p /srv/demo ; mkdir -p /srv/demo ;
cd /srv/demo ; cd /srv/demo ;
@ -29,10 +29,10 @@ services:
sleep 5 ; sleep 5 ;
done ; done ;
sha=`git rev-parse HEAD` ; sha=`git rev-parse HEAD` ;
while : ; do for delay in 1 1 1 1 2 5 5 10 10 10 15 ; do
curl -sS -f http://forgejo:3000/api/v1/repos/root/test/commits/$$sha/status | jq --raw-output .state | tee status ; curl -sS -f http://forgejo:3000/api/v1/repos/root/test/commits/$$sha/status | jq --raw-output .state | tee status ;
grep success status && break ; if grep success status ; then echo DEMO WORKFLOW SUCCESS && break ; fi ;
sleep 5 ; if grep failure status ; then echo DEMO WORKFLOW FAILURE && break ; fi ;
done ; sleep $$delay ;
echo DEMO WORKFLOW SUCCESS done
' '

View File

@ -56,7 +56,7 @@ services:
- /srv/runner-data:/data - /srv/runner-data:/data
user: 0:0 user: 0:0
command: >- command: >-
bash -c ' bash -ec '
while : ; do while : ; do
forgejo-runner create-runner-file --instance http://forgejo:3000 --name runner --secret {SHARED_SECRET} && break ; forgejo-runner create-runner-file --instance http://forgejo:3000 --name runner --secret {SHARED_SECRET} && break ;
sleep 1 ; sleep 1 ;