From bb2c826cbc023726d62f90f81cdbfffe10f7b16d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?sag=E1=A0=8Ee?= Date: Thu, 5 May 2022 16:47:38 +0700 Subject: [PATCH] Use PostgreSQL 11 when testing against Django main (#8489) Django dropped support for PostgreSQL 10 as of Django 4.1 --- .github/workflows/test.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 16915c67cd..efdc95ba21 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -82,10 +82,13 @@ jobs: - python: '3.10' django: 'git+https://github.com/django/django.git@main#egg=Django' experimental: true + postgres: 'postgres:11' services: postgres: - image: postgres:10.8 + image: ${{ matrix.postgres || 'postgres:10.8' }} + env: + POSTGRES_PASSWORD: postgres ports: - 5432:5432 options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 @@ -110,7 +113,7 @@ jobs: DATABASE_ENGINE: django.db.backends.postgresql DATABASE_HOST: localhost DATABASE_USER: postgres - DATABASE_PASS: postgres + DATABASE_PASSWORD: postgres USE_EMAIL_USER_MODEL: ${{ matrix.emailuser }} DISABLE_TIMEZONE: ${{ matrix.notz }} @@ -288,7 +291,7 @@ jobs: DATABASE_ENGINE: django.db.backends.postgresql DATABASE_HOST: localhost DATABASE_USER: postgres - DATABASE_PASS: postgres + DATABASE_PASSWORD: postgres USE_EMAIL_USER_MODEL: ${{ matrix.emailuser }} test-postgres-elasticsearch7: @@ -338,5 +341,5 @@ jobs: DATABASE_ENGINE: django.db.backends.postgresql DATABASE_HOST: localhost DATABASE_USER: postgres - DATABASE_PASS: postgres + DATABASE_PASSWORD: postgres USE_EMAIL_USER_MODEL: ${{ matrix.emailuser }}