From 9ff437ab18714a91d35bc4e7f21caa1e85cb83ff Mon Sep 17 00:00:00 2001 From: Mark Story Date: Fri, 26 Apr 2024 23:37:14 -0400 Subject: [PATCH] Align postgres build config with no-phinx The builds on that branch have been reliable and hopefully this fixes the build issues we've seen in #711 --- .github/workflows/ci.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b80ec01..f4451781 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,8 +33,15 @@ jobs: ports: - 5432:5432 env: + POSTGRES_USER: postgres POSTGRES_PASSWORD: pg-password + PGPASSWORD: pg-password POSTGRES_DB: cakephp_test + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 steps: - uses: actions/checkout@v4 @@ -49,9 +56,11 @@ jobs: - name: Setup Postgres if: matrix.db-type == 'pgsql' + env: + PGUSER: postgres + PGPASSWORD: pg-password run: | - export PGPASSWORD='pg-password' - psql -h 127.0.0.1 -U postgres -c 'CREATE DATABASE "cakephp_snapshot";' + psql -h 127.0.0.1 -c 'CREATE DATABASE "cakephp_snapshot";' - name: Setup PHP uses: shivammathur/setup-php@v2