From fdaa6d2ca828a165f2a422743c06530874ab689e Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 23 Aug 2023 21:38:06 +0200 Subject: [PATCH] fix tests --- .github/DockerfileBackendTests | 2 +- .github/workflows/backend-test.yml | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/DockerfileBackendTests b/.github/DockerfileBackendTests index 6c79284bdc..aa744196db 100644 --- a/.github/DockerfileBackendTests +++ b/.github/DockerfileBackendTests @@ -33,7 +33,7 @@ ENV SQLX_OFFLINE=true RUN mkdir -p /frontend/build RUN apt-get update \ - && apt-get install -y ca-certificates tzdata libpq5 \ + && apt-get install -y ca-certificates tzdata libpq5 cmake\ make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev \ libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libxml2-dev \ libxmlsec1-dev libffi-dev liblzma-dev mecab-ipadic-utf8 libgdbm-dev libc6-dev git libprotobuf-dev=3.6.* libnl-route-3-dev=3.4.* \ diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml index ff220203b2..d89c3fa56e 100644 --- a/.github/workflows/backend-test.yml +++ b/.github/workflows/backend-test.yml @@ -18,7 +18,6 @@ jobs: runs-on: [self-hosted, new] container: image: ghcr.io/windmill-labs/backend-tests - options: --privileged services: postgres: image: postgres @@ -27,9 +26,7 @@ jobs: POSTGRES_PASSWORD: changeme options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s + --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - uses: actions/checkout@v3 @@ -41,4 +38,8 @@ jobs: backend -> target - name: cargo test timeout-minutes: 10 - run: mkdir frontend/build && cd backend && touch windmill-api/openapi-deref.yaml && DATABASE_URL=postgres://postgres:changeme@postgres:5432/windmill cargo test --all -- --nocapture + run: + mkdir frontend/build && cd backend && touch + windmill-api/openapi-deref.yaml && + DATABASE_URL=postgres://postgres:changeme@postgres:5432/windmill cargo + test --all -- --nocapture