From c2c90f0a6646c75231ec8602da67c1ef0abfb529 Mon Sep 17 00:00:00 2001 From: "tan.nguyen" Date: Wed, 24 Apr 2024 13:00:52 +0700 Subject: [PATCH] Add php-8.3, retire php-8.1. --- .circleci/config.yml | 46 +++++++++++++++++++++++--------------- .github/workflows/test.yml | 24 ++++++++++++-------- README.md | 3 +-- composer.json | 2 +- phpcs.xml | 2 +- 5 files changed, 46 insertions(+), 31 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fd44a00..1047fb4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -76,40 +76,48 @@ job-test: &job-test path: /tmp/artifacts jobs: - test-php-8.1: - <<: *container_config - docker: - - image: cimg/php:8.1-browsers - <<: *job-test - test-php-8.2: <<: *container_config docker: - image: cimg/php:8.2-browsers <<: *job-test - test-php-8.1-legacy: + test-php-8.2-legacy: <<: *container_config docker: - - image: cimg/php:8.1-browsers + - image: cimg/php:8.2-browsers environment: DRUPAL_VERSION: 9.5 DRUPAL_PROJECT_SHA: 9.x <<: *job-test - test-php-8.2-legacy: + test-php-8.2-next: <<: *container_config docker: - image: cimg/php:8.2-browsers + environment: + DRUPAL_VERSION: 10@beta + <<: *job-test + + test-php-8.3: + <<: *container_config + docker: + - image: cimg/php:8.3-browsers + <<: *job-test + + test-php-8.3-legacy: + <<: *container_config + docker: + - image: cimg/php:8.3-browsers environment: DRUPAL_VERSION: 9.5 DRUPAL_PROJECT_SHA: 9.x <<: *job-test - test-php-8.2-next: + test-php-8.3-next: <<: *container_config docker: - - image: cimg/php:8.2-browsers + - image: cimg/php:8.3-browsers environment: DRUPAL_VERSION: 10@beta <<: *job-test @@ -134,31 +142,33 @@ workflows: version: 2 commit: jobs: - - test-php-8.1: + - test-php-8.2: filters: tags: only: /.*/ - - test-php-8.2: + - test-php-8.2-legacy: filters: tags: only: /.*/ - - test-php-8.1-legacy: + - test-php-8.2-next: filters: tags: only: /.*/ - - test-php-8.2-legacy: + - test-php-8.3: filters: tags: only: /.*/ - - test-php-8.2-next: + - test-php-8.3-legacy: + filters: + tags: + only: /.*/ + - test-php-8.3-next: filters: tags: only: /.*/ - deploy: requires: - - test-php-8.1 - test-php-8.2 - - test-php-8.1-legacy - test-php-8.2-legacy - test-php-8.2-next filters: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index efc6c5a..fdfd1e8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,29 +15,35 @@ jobs: strategy: matrix: include: - - name: test-php-8.1 - php-version: 8.1 - drupal-version: stable - - name: test-php-8.2 php-version: 8.2 drupal-version: stable drupal-version-alias: stable - - name: test-php-8.1-legacy - php-version: 8.1 + - name: test-php-8.2-legacy + php-version: 8.2 drupal-version: 9.5 drupal-project-sha: 9.x drupal-version-alias: legacy - - name: test-php-8.2-legacy + - name: test-php-8.2-next php-version: 8.2 + drupal-version: 10@beta + drupal-version-alias: next + + - name: test-php-8.3 + php-version: 8.3 + drupal-version: stable + drupal-version-alias: stable + + - name: test-php-8.3-legacy + php-version: 8.3 drupal-version: 9.5 drupal-project-sha: 9.x drupal-version-alias: legacy - - name: test-php-8.2-next - php-version: 8.2 + - name: test-php-8.3-next + php-version: 8.3 drupal-version: 10@beta drupal-version-alias: next diff --git a/README.md b/README.md index 2300660..db91f97 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,7 @@ to [drupal.org](https://drupal.org). ## Features - Turnkey CI configuration with artifacts and test results support. - - PHP version matrix for [8.2](https://www.php.net/supported-versions.php) - and [8.1](https://www.php.net/supported-versions.php). + - PHP version matrix for [8.2](https://www.php.net/supported-versions.php). - Drupal version matrix: `stable`, `next` and `last EOL` version. - CI providers: - [GitHub Actions](.github/workflows/test.yml) diff --git a/composer.json b/composer.json index 229027a..55e7764 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "source": "https://git.drupalcode.org/project/your_extension" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { "drupal/pathauto": "~1.0" diff --git a/phpcs.xml b/phpcs.xml index 0a9db16..ab998cb 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -15,7 +15,7 @@ - + circle\.yml