diff --git a/.github/workflows/sqlx.yml b/.github/workflows/sqlx.yml index 5a7673f26b..1a91e1fa83 100644 --- a/.github/workflows/sqlx.yml +++ b/.github/workflows/sqlx.yml @@ -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 diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index 0671653a28..bb0cc51c83 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/tests/x.py b/tests/x.py index 8aca890fb6..0f15b59124 100755 --- a/tests/x.py +++ b/tests/x.py @@ -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}",