Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Roll PostgreSQL 11..=15 tests to 13..=17 #3643

Merged
merged 1 commit into from
Dec 20, 2024
Merged

Roll PostgreSQL 11..=15 tests to 13..=17 #3643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/sqlx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
postgres: [15, 11]
postgres: [17, 13]
runtime: [async-std, tokio]
tls: [native-tls, rustls-aws-lc-rs, rustls-ring, none]
needs: check
Expand Down
42 changes: 21 additions & 21 deletions tests/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,16 +209,16 @@ services:
MARIADB_DATABASE: sqlx
MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: 1
#
# PostgreSQL 15.x, 14.x, 13.x, 12.x, 11.x
# PostgreSQL 17.x, 16.x, 15.x, 14.x, 13.x
# https://www.postgresql.org/support/versioning/
#

postgres_15:
postgres_17:
build:
context: .
dockerfile: postgres/Dockerfile
args:
VERSION: 15
VERSION: 17
ports:
- 5432
environment:
Expand All @@ -234,12 +234,12 @@ services:
command: >
-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

postgres_15_client_ssl:
postgres_17_client_ssl:
build:
context: .
dockerfile: postgres/Dockerfile
args:
VERSION: 15
VERSION: 17
ports:
- 5432
environment:
Expand All @@ -251,12 +251,12 @@ services:
command: >
-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

postgres_14:
postgres_16:
build:
context: .
dockerfile: postgres/Dockerfile
args:
VERSION: 14
VERSION: 16
ports:
- 5432
environment:
Expand All @@ -270,12 +270,12 @@ services:
command: >
-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key

postgres_14_client_ssl:
postgres_16_client_ssl:
build:
context: .
dockerfile: postgres/Dockerfile
args:
VERSION: 14
VERSION: 16
ports:
- 5432
environment:
Expand All @@ -287,12 +287,12 @@ services:
command: >
-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

postgres_13:
postgres_15:
build:
context: .
dockerfile: postgres/Dockerfile
args:
VERSION: 13
VERSION: 15
ports:
- 5432
environment:
Expand All @@ -306,12 +306,12 @@ services:
command: >
-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key

postgres_13_client_ssl:
postgres_15_client_ssl:
build:
context: .
dockerfile: postgres/Dockerfile
args:
VERSION: 13
VERSION: 15
ports:
- 5432
environment:
Expand All @@ -323,12 +323,12 @@ services:
command: >
-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

postgres_12:
postgres_14:
build:
context: .
dockerfile: postgres/Dockerfile
args:
VERSION: 12
VERSION: 14
ports:
- 5432
environment:
Expand All @@ -342,12 +342,12 @@ services:
command: >
-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key

postgres_12_client_ssl:
postgres_14_client_ssl:
build:
context: .
dockerfile: postgres/Dockerfile
args:
VERSION: 12.3
VERSION: 14
ports:
- 5432
environment:
Expand All @@ -359,12 +359,12 @@ services:
command: >
-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

postgres_11:
postgres_13:
build:
context: .
dockerfile: postgres/Dockerfile
args:
VERSION: 11
VERSION: 13
ports:
- 5432
environment:
Expand All @@ -378,12 +378,12 @@ services:
command: >
-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key

postgres_11_client_ssl:
postgres_13_client_ssl:
build:
context: .
dockerfile: postgres/Dockerfile
args:
VERSION: 11
VERSION: 13
ports:
- 5432
environment:
Expand Down
2 changes: 1 addition & 1 deletion tests/x.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
# postgres
#

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