diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c89b2f7d6..bbb6c59c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,13 +48,13 @@ jobs: matrix: script: - name: Basic - Postgres - args: "database_engine=postgresql database_version='postgresql@14.1'" + args: "database_engine=postgresql database_version='postgresql@14'" - name: Extended - Postgres - args: "use_celery=y use_drf=y frontend_pipeline=Gulp database_engine=postgresql database_version='postgresql@14.1'" + args: "use_celery=y use_drf=y frontend_pipeline=Gulp database_engine=postgresql database_version='postgresql@14'" - name: Basic - MySQL - args: "database_engine=mysql database_version='mysql@8.0.28'" + args: "database_engine=mysql database_version='mysql@8.0.29'" - name: Extended - MySQL - args: "use_celery=y use_drf=y frontend_pipeline=Gulp database_engine=mysql database_version='mysql@8.0.28'" + args: "use_celery=y use_drf=y frontend_pipeline=Gulp database_engine=mysql database_version='mysql@8.0.29'" name: "${{ matrix.script.name }} Docker" runs-on: ubuntu-latest @@ -79,11 +79,11 @@ jobs: matrix: script: - name: With Celery - args: "use_celery=y frontend_pipeline='Django Compressor' database_engine=postgresql database_version=postgresql@14.1" + args: "use_celery=y frontend_pipeline='Django Compressor' database_engine=postgresql database_version=postgresql@14" # postgres://user:password@host:port/database database_url: "postgres://postgres:postgres@localhost:5432/postgres" - name: With Gulp - args: "frontend_pipeline='Gulp' custom_bootstrap_compilation=y database_engine=postgresql database_version=postgresql@14.1" + args: "frontend_pipeline='Gulp' custom_bootstrap_compilation=y database_engine=postgresql database_version=postgresql@14" database_url: "postgres://postgres:postgres@localhost:5432/postgres" name: "${{ matrix.script.name }} Bare metal" diff --git a/cookiecutter.json b/cookiecutter.json index 8f0bdd003..7d402027f 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -24,7 +24,7 @@ "postgresql@12", "postgresql@11", "postgresql@10", - "mysql@8.0.28", + "mysql@8.0.29", "mysql@8.0", "mysql@5.7" ], diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index d30974e9c..256ff6749 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -52,7 +52,7 @@ SUPPORTED_COMBINATIONS = [ {"database_engine": "postgresql", "database_version": "postgresql@12"}, {"database_engine": "postgresql", "database_version": "postgresql@11"}, {"database_engine": "postgresql", "database_version": "postgresql@10"}, - {"database_engine": "mysql", "database_version": "mysql@8.0.28"}, + {"database_engine": "mysql", "database_version": "mysql@8.0.29"}, {"database_engine": "mysql", "database_version": "mysql@8.0"}, {"database_engine": "mysql", "database_version": "mysql@5.7"}, {"cloud_provider": "AWS", "use_whitenoise": "y"}, @@ -117,14 +117,14 @@ UNSUPPORTED_COMBINATIONS = [ {"cloud_provider": "None", "use_whitenoise": "n"}, {"cloud_provider": "GCP", "mail_service": "Amazon SES"}, {"cloud_provider": "None", "mail_service": "Amazon SES"}, - {"database_engine": "postgresql", "database_version": "mysql@8.0.28"}, + {"database_engine": "postgresql", "database_version": "mysql@8.0.29"}, {"database_engine": "postgresql", "database_version": "mysql@8.0"}, {"database_engine": "postgresql", "database_version": "mysql@5.7"}, - {"database_engine": "mysql", "database_version": "postgresql@14.1"}, - {"database_engine": "mysql", "database_version": "postgresql@13.5"}, - {"database_engine": "mysql", "database_version": "postgresql@12.9"}, - {"database_engine": "mysql", "database_version": "postgresql@11.14"}, - {"database_engine": "mysql", "database_version": "postgresql@10.19"}, + {"database_engine": "mysql", "database_version": "postgresql@14"}, + {"database_engine": "mysql", "database_version": "postgresql@13"}, + {"database_engine": "mysql", "database_version": "postgresql@12"}, + {"database_engine": "mysql", "database_version": "postgresql@11"}, + {"database_engine": "mysql", "database_version": "postgresql@10"}, ]