File tree Expand file tree Collapse file tree 4 files changed +15
-6
lines changed
Expand file tree Collapse file tree 4 files changed +15
-6
lines changed Original file line number Diff line number Diff line change @@ -240,8 +240,12 @@ jobs:
240240
241241 postgres-test :
242242 runs-on : ubuntu-22.04
243- name : postgresql build + test
243+ name : postgresql ${{ matrix.postgres_tag }} build + test
244244 timeout-minutes : 10
245+ strategy :
246+ fail-fast : false
247+ matrix :
248+ postgres_tag : ['17', '15']
245249
246250 steps :
247251
@@ -250,7 +254,7 @@ jobs:
250254 submodules : true
251255
252256 - name : build and start postgresql container
253- run : make postgres-docker-rebuild
257+ run : POSTGRES_TAG=${{ matrix.postgres_tag }} make postgres-docker-rebuild
254258
255259 - name : wait for postgresql to be ready
256260 run : |
Original file line number Diff line number Diff line change 11# PostgreSQL Docker image with CloudSync extension pre-installed
2- FROM postgres:17
2+ ARG POSTGRES_TAG=17
3+ FROM postgres:${POSTGRES_TAG}
34
4- # Install build dependencies
5+ # Derive the major version from PG_MAJOR (set by the official postgres image)
6+ # and install the matching server-dev package
57RUN apt-get update && apt-get install -y \
68 build-essential \
7- postgresql-server-dev-17 \
9+ postgresql-server-dev-${PG_MAJOR} \
810 git \
911 make \
1012 && rm -rf /var/lib/apt/lists/*
Original file line number Diff line number Diff line change @@ -3,6 +3,8 @@ services:
33 build :
44 context : ../..
55 dockerfile : docker/postgresql/Dockerfile
6+ args :
7+ POSTGRES_TAG : ${POSTGRES_TAG:-17}
68 container_name : cloudsync-postgres
79 environment :
810 POSTGRES_USER : postgres
Original file line number Diff line number Diff line change @@ -17,7 +17,8 @@ CREATE EXTENSION IF NOT EXISTS cloudsync;
1717
1818-- 'Test version visibility'
1919SELECT cloudsync_version() AS version \gset
20- \echo [PASS] (:testid) Test cloudsync_version: :version
20+ SELECT current_setting(' server_version' ) AS pg_version \gset
21+ \echo [PASS] (:testid) Test cloudsync_version: :version (PostgreSQL :pg_version)
2122
2223-- Test uuid generation
2324SELECT cloudsync_uuid() AS uuid1 \gset
You can’t perform that action at this time.
0 commit comments