postgres as service

.github/actions/setup-postgres-macos/action.yml

@@ -5,6 +5,7 @@ runs:
   steps:
     - shell: bash
       run: |
+        brew services start postgresql
         echo "Check PostgreSQL service is running"
         i=10
         COMMAND='pg_isready'

.github/actions/setup-postgres-windows/action.yml

@@ -2,8 +2,6 @@ name: "Set up postgres (windows)"
 description: "Set up postgres service on windows vm for dbt integration tests"
 runs:
   using: "composite"
-  env:
-    PQ_LIB_DIR: 'C:\Program Files\PostgreSQL\16\lib'
   steps:
     - shell: pwsh
       run: |

.github/workflows/main.yml

@@ -165,6 +165,18 @@ jobs:
         os: [ubuntu-20.04]
         split-group: ${{ fromJson(needs.integration-metadata.outputs.split-groups) }}
         include: ${{ fromJson(needs.integration-metadata.outputs.include) }}
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
     env:
       TOXENV: integration
       DBT_INVOCATION_ENV: github-actions
@@ -186,29 +198,35 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install postgres 16
-        uses: ikalnytskyi/action-setup-postgres@v6
-        with:
-          postgres-version: "16"
-        id: postgres
-
       - name: Set up postgres (linux)
         if: runner.os == 'Linux'
         uses: ./.github/actions/setup-postgres-linux
         env:
-          CONNECTION_STR: ${{ steps.postgres.outputs.connection-uri }}
+          PGHOST: localhost
+          PGPORT: 5432
+          PGUSER: postgres
+          PGPASSWORD: postgres
+          PGDATABASE: postgres
 
       - name: Set up postgres (macos)
         if: runner.os == 'macOS'
         uses: ./.github/actions/setup-postgres-macos
         env:
-          CONNECTION_STR: ${{ steps.postgres.outputs.connection-uri }}
+          PGHOST: localhost
+          PGPORT: 5432
+          PGUSER: postgres
+          PGPASSWORD: postgres
+          PGDATABASE: postgres
 
       - name: Set up postgres (windows)
         if: runner.os == 'Windows'
         uses: ./.github/actions/setup-postgres-windows
         env:
-          CONNECTION_STR: ${{ steps.postgres.outputs.connection-uri }}
+          PGHOST: localhost
+          PGPORT: 5432
+          PGUSER: postgres
+          PGPASSWORD: postgres
+          PGDATABASE: postgres
 
       - name: Install python tools
         run: |
@@ -225,7 +243,6 @@ jobs:
           command: tox -- --ddtrace
         env:
           PYTEST_ADDOPTS: ${{ format('--splits {0} --group {1}', env.PYTHON_INTEGRATION_TEST_WORKERS, matrix.split-group) }}
-          CONNECTION_STR: ${{ steps.postgres.outputs.connection-uri }}
 
       - name: Get current date
         if: always()

test/setup_db.sh

@@ -5,8 +5,6 @@ env | grep '^PG'
 # If you want to run this script for your own postgresql (run with
 # docker-compose) it will look like this:
 # PGHOST=127.0.0.1 PGUSER=root PGPASSWORD=password PGDATABASE=postgres \
-PG_CONNECTION_URI="${CONNECTION_URI}"
-export PG_CONNECTION_URI
 PGUSER="${PGUSER:-postgres}"
 export PGUSER
 PGPORT="${PGPORT:-5432}"
@@ -17,11 +15,11 @@ function connect_circle() {
 	# try to handle circleci/docker oddness
 	let rc=1
 	while [[ $rc -eq 1 ]]; do
-		nc -z ${PG_CONNECTION_URI}
+		nc -z ${PGHOST} ${PGPORT}
 		let rc=$?
 	done
 	if [[ $rc -ne 0 ]]; then
-		echo "Fatal: Could not connect to $PG_CONNECTION_URI"
+		echo "Fatal: Could not connect to $PGHOST"
 		exit 1
 	fi
 }
@@ -32,7 +30,7 @@ if [[ -n $CIRCLECI ]]; then
 fi
 
 for i in {1..10}; do
-	if pg_isready --d "${PG_CONNECTION_URI}"; then
+	if pg_isready -h "${PGHOST}" -p "${PGPORT}" -U "${PGUSER}" ; then
 		break
 	fi