Skip to content

Commit 9f6ea96

Browse files
paolobarboliniabonander
authored andcommitted
Roll PostgreSQL 11..=15 tests to 13..=17
1 parent 1678b19 commit 9f6ea96

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

.github/workflows/sqlx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
runs-on: ubuntu-22.04
183183
strategy:
184184
matrix:
185-
postgres: [15, 11]
185+
postgres: [17, 13]
186186
runtime: [async-std, tokio]
187187
tls: [native-tls, rustls-aws-lc-rs, rustls-ring, none]
188188
needs: check

tests/docker-compose.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -209,16 +209,16 @@ services:
209209
MARIADB_DATABASE: sqlx
210210
MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: 1
211211
#
212-
# PostgreSQL 15.x, 14.x, 13.x, 12.x, 11.x
212+
# PostgreSQL 17.x, 16.x, 15.x, 14.x, 13.x
213213
# https://www.postgresql.org/support/versioning/
214214
#
215215

216-
postgres_15:
216+
postgres_17:
217217
build:
218218
context: .
219219
dockerfile: postgres/Dockerfile
220220
args:
221-
VERSION: 15
221+
VERSION: 17
222222
ports:
223223
- 5432
224224
environment:
@@ -234,12 +234,12 @@ services:
234234
command: >
235235
-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key -c shared_preload_libraries=pg_stat_statements
236236
237-
postgres_15_client_ssl:
237+
postgres_17_client_ssl:
238238
build:
239239
context: .
240240
dockerfile: postgres/Dockerfile
241241
args:
242-
VERSION: 15
242+
VERSION: 17
243243
ports:
244244
- 5432
245245
environment:
@@ -251,12 +251,12 @@ services:
251251
command: >
252252
-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key -c ssl_ca_file=/var/lib/postgresql/ca.crt -c hba_file=/var/lib/postgresql/pg_hba.conf
253253
254-
postgres_14:
254+
postgres_16:
255255
build:
256256
context: .
257257
dockerfile: postgres/Dockerfile
258258
args:
259-
VERSION: 14
259+
VERSION: 16
260260
ports:
261261
- 5432
262262
environment:
@@ -270,12 +270,12 @@ services:
270270
command: >
271271
-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key
272272
273-
postgres_14_client_ssl:
273+
postgres_16_client_ssl:
274274
build:
275275
context: .
276276
dockerfile: postgres/Dockerfile
277277
args:
278-
VERSION: 14
278+
VERSION: 16
279279
ports:
280280
- 5432
281281
environment:
@@ -287,12 +287,12 @@ services:
287287
command: >
288288
-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key -c ssl_ca_file=/var/lib/postgresql/ca.crt -c hba_file=/var/lib/postgresql/pg_hba.conf
289289
290-
postgres_13:
290+
postgres_15:
291291
build:
292292
context: .
293293
dockerfile: postgres/Dockerfile
294294
args:
295-
VERSION: 13
295+
VERSION: 15
296296
ports:
297297
- 5432
298298
environment:
@@ -306,12 +306,12 @@ services:
306306
command: >
307307
-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key
308308
309-
postgres_13_client_ssl:
309+
postgres_15_client_ssl:
310310
build:
311311
context: .
312312
dockerfile: postgres/Dockerfile
313313
args:
314-
VERSION: 13
314+
VERSION: 15
315315
ports:
316316
- 5432
317317
environment:
@@ -323,12 +323,12 @@ services:
323323
command: >
324324
-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key -c ssl_ca_file=/var/lib/postgresql/ca.crt -c hba_file=/var/lib/postgresql/pg_hba.conf
325325
326-
postgres_12:
326+
postgres_14:
327327
build:
328328
context: .
329329
dockerfile: postgres/Dockerfile
330330
args:
331-
VERSION: 12
331+
VERSION: 14
332332
ports:
333333
- 5432
334334
environment:
@@ -342,12 +342,12 @@ services:
342342
command: >
343343
-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key
344344
345-
postgres_12_client_ssl:
345+
postgres_14_client_ssl:
346346
build:
347347
context: .
348348
dockerfile: postgres/Dockerfile
349349
args:
350-
VERSION: 12.3
350+
VERSION: 14
351351
ports:
352352
- 5432
353353
environment:
@@ -359,12 +359,12 @@ services:
359359
command: >
360360
-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key -c ssl_ca_file=/var/lib/postgresql/ca.crt -c hba_file=/var/lib/postgresql/pg_hba.conf
361361
362-
postgres_11:
362+
postgres_13:
363363
build:
364364
context: .
365365
dockerfile: postgres/Dockerfile
366366
args:
367-
VERSION: 11
367+
VERSION: 13
368368
ports:
369369
- 5432
370370
environment:
@@ -378,12 +378,12 @@ services:
378378
command: >
379379
-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key
380380
381-
postgres_11_client_ssl:
381+
postgres_13_client_ssl:
382382
build:
383383
context: .
384384
dockerfile: postgres/Dockerfile
385385
args:
386-
VERSION: 11
386+
VERSION: 13
387387
ports:
388388
- 5432
389389
environment:

tests/x.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
175175
# postgres
176176
#
177177

178-
for version in ["15", "14", "13", "12", "11"]:
178+
for version in ["17", "16", "15", "14", "13"]:
179179
run(
180180
f"cargo test --no-default-features --features any,postgres,macros,_unstable-all-types,runtime-{runtime},tls-{tls}",
181181
comment=f"test postgres {version}",

0 commit comments

Comments
 (0)