From 186bae4785ea043f90fbee4508881cbad761b942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Thu, 27 Feb 2020 00:14:36 +0100 Subject: [PATCH] test --- .github/tests.sh | 11 ++++++----- .github/workflows/ci.yaml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/tests.sh b/.github/tests.sh index ec6651b..e77a26b 100755 --- a/.github/tests.sh +++ b/.github/tests.sh @@ -6,15 +6,16 @@ set -o errexit set -o pipefail -until (curl -I --silent --fail localhost | grep -iq zammad_session); do +until (curl -I --silent --fail localhost | grep -iq "HTTP/1.1 200 OK"); do echo "wait for zammad to be ready..." sleep 15 done -docker exec -i zammad-docker-compose_zammad-railsserver_1 bash <<'EOF' -set -o errexit -bundle exec rails test test/unit/user_test.rb +echo "Zammad is up :)" -EOF +# docker exec -i zammad-docker-compose_zammad-railsserver_1 bash <<'EOF' +# set -o errexit +# bundle exec rails test test/unit/user_test.rb +# EOF docker-compose logs \ No newline at end of file diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 450d9a8..8fc2445 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -43,7 +43,7 @@ jobs: - name: pull container images run: docker-compose pull - name: run docker-compose up - run: docker-compose up -d + run: docker-compose up & - name: run tests run: .github/tests.sh