mirror of https://code.forgejo.org/forgejo/runner
Merge pull request 'ci: use new ci image' (#361) from ci/use-ci-image into main
Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/361 Reviewed-by: earl-warren <earl-warren@noreply.code.forgejo.org>pull/370/head
commit
f3bcb0e57a
|
@ -20,7 +20,7 @@ jobs:
|
||||||
if: github.repository_owner != 'forgejo-integration' && github.repository_owner != 'forgejo-experimental' && github.repository_owner != 'forgejo-release'
|
if: github.repository_owner != 'forgejo-integration' && github.repository_owner != 'forgejo-experimental' && github.repository_owner != 'forgejo-release'
|
||||||
runs-on: docker
|
runs-on: docker
|
||||||
container:
|
container:
|
||||||
image: 'code.forgejo.org/oci/node:20-bookworm'
|
image: 'code.forgejo.org/oci/ci:1'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
forgejo:
|
forgejo:
|
||||||
|
@ -65,8 +65,6 @@ jobs:
|
||||||
|
|
||||||
- name: check the forgejo server is responding
|
- name: check the forgejo server is responding
|
||||||
run: |
|
run: |
|
||||||
apt-get update -qq
|
|
||||||
apt-get install -y -qq jq curl retry
|
|
||||||
sleep 10 # matches the sleep 10 in the bootstrap of the Forgejo instance
|
sleep 10 # matches the sleep 10 in the bootstrap of the Forgejo instance
|
||||||
# in case of a slow machine, give it time to bootstrap
|
# in case of a slow machine, give it time to bootstrap
|
||||||
retry --delay=10 --times=6 bash -c 'test $FORGEJO_ADMIN_USER = $(curl -sS http://$FORGEJO_ADMIN_USER:$FORGEJO_ADMIN_PASSWORD@$FORGEJO_HOST_PORT/api/v1/user | jq --raw-output .login)'
|
retry --delay=10 --times=6 bash -c 'test $FORGEJO_ADMIN_USER = $(curl -sS http://$FORGEJO_ADMIN_USER:$FORGEJO_ADMIN_PASSWORD@$FORGEJO_HOST_PORT/api/v1/user | jq --raw-output .login)'
|
||||||
|
|
Loading…
Reference in New Issue