From 08fc5f6c6f644a5c08a37fb06acb9564caa8faea Mon Sep 17 00:00:00 2001 From: Dovid Levine Date: Sun, 17 Sep 2023 11:51:23 +0000 Subject: [PATCH] ci: test against WP 6.3 + PHP 8.1 --- .github/workflows/code-quality.yml | 2 +- .github/workflows/code-standard.yml | 2 +- .github/workflows/integration-testing.yml | 8 +++++--- .github/workflows/schema-linter.yml | 2 +- CHANGELOG.md | 1 + README.md | 2 +- bin/run-docker.sh | 12 ++++++------ docker-compose.yml | 2 +- readme.txt | 2 +- wp-graphql-gravity-forms.php | 2 +- 10 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 755cc030..043f8a19 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -40,7 +40,7 @@ jobs: - name: Setup PHP w/ Composer & WP-CLI uses: shivammathur/setup-php@v2 with: - php-version: 8.0 + php-version: 8.1 extensions: mbstring, intl, bcmath, exif, gd, mysqli, opcache, zip, pdo_mysql tools: composer:v2, wp-cli coverage: none diff --git a/.github/workflows/code-standard.yml b/.github/workflows/code-standard.yml index 57148638..9ef793b7 100644 --- a/.github/workflows/code-standard.yml +++ b/.github/workflows/code-standard.yml @@ -25,7 +25,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.0 + php-version: 8.1 tools: composer:v2 coverage: none diff --git a/.github/workflows/integration-testing.yml b/.github/workflows/integration-testing.yml index 01ea7ddc..673ad2c0 100644 --- a/.github/workflows/integration-testing.yml +++ b/.github/workflows/integration-testing.yml @@ -23,11 +23,11 @@ jobs: strategy: matrix: - php: [ '8.0', '7.4' ] - wordpress: [ '6.2', '6.1', '6.0', '5.9' ] + php: [ '8.1', '8.0', '7.4' ] + wordpress: [ '6.3', '6.2', '6.1', '6.0', '5.9' ] include: - php: '8.1' - wordpress: '6.2' + wordpress: '6.3' coverage: 1 # Older versions of WordPress - php: '8.0' @@ -39,6 +39,8 @@ jobs: - php: '7.4' wordpress: '5.7' exclude: + - php: '7.4' + wordpress: '6.3' - php: '7.4' wordpress: '6.2' fail-fast: false diff --git a/.github/workflows/schema-linter.yml b/.github/workflows/schema-linter.yml index 64e5b52c..ae3c54c1 100644 --- a/.github/workflows/schema-linter.yml +++ b/.github/workflows/schema-linter.yml @@ -39,7 +39,7 @@ jobs: - name: Setup PHP w/ Composer & WP-CLI uses: shivammathur/setup-php@v2 with: - php-version: 8.0 + php-version: 8.1 extensions: mbstring, intl, bcmath, exif, gd, mysqli, opcache, zip, pdo_mysql coverage: none tools: composer:v2, wp-cli diff --git a/CHANGELOG.md b/CHANGELOG.md index a3a0d29a..1185046f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - chore: Update Composer dev-deps. - tests: Set `WPLoader.loadOnly` to true for acceptance suite. Thanks @lucatume! - ci: Fix GitHub Action workflows by locking MariaDB version to v10. +- ci: Test against WordPress 6.3 and PHP 8.1 ## v0.12.2 diff --git a/README.md b/README.md index 185683b6..e784b739 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Our hope for this open source project is that it will enable more teams to lever ## System Requirements -* PHP 7.4+ || 8.0 +* PHP 7.4+ * WordPress 5.4.1+ * WPGraphQL 1.9.0+ * Gravity Forms 2.5+ (Recommend: v2.6+) diff --git a/bin/run-docker.sh b/bin/run-docker.sh index fd99ce52..5f181ea5 100644 --- a/bin/run-docker.sh +++ b/bin/run-docker.sh @@ -16,11 +16,11 @@ print_usage_instructions() { echo " composer build-app" echo " composer run-app" echo "" - echo " WP_VERSION=6.2 PHP_VERSION=8.0 composer build-app" - echo " WP_VERSION=6.2 PHP_VERSION=8.0 composer run-app" + echo " WP_VERSION=6.3 PHP_VERSION=8.1 composer build-app" + echo " WP_VERSION=6.3 PHP_VERSION=8.1 composer run-app" echo "" - echo " WP_VERSION=6.2 PHP_VERSION=8.0 bin/run-docker.sh build -a" - echo " WP_VERSION=6.2 PHP_VERSION=8.0 bin/run-docker.sh run -a" + echo " WP_VERSION=6.3 PHP_VERSION=8.1 bin/run-docker.sh build -a" + echo " WP_VERSION=6.3 PHP_VERSION=8.1 bin/run-docker.sh run -a" exit 1 } @@ -29,8 +29,8 @@ if [ $# -eq 0 ]; then fi TAG=${TAG-latest} -WP_VERSION=${WP_VERSION-6.2} -PHP_VERSION=${PHP_VERSION-8.0} +WP_VERSION=${WP_VERSION-6.3} +PHP_VERSION=${PHP_VERSION-8.1} BUILD_NO_CACHE=${BUILD_NO_CACHE-} diff --git a/docker-compose.yml b/docker-compose.yml index e966fbbc..cae3dc55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: app: depends_on: - app_db - image: wp-graphql-gravity-forms:latest-wp${WP_VERSION-6.2}-php${PHP_VERSION-8.0} + image: wp-graphql-gravity-forms:latest-wp${WP_VERSION-6.3}-php${PHP_VERSION-8.1} volumes: - .:/var/www/html/wp-content/plugins/wp-graphql-gravity-forms - ./.log/app:/var/log/apache2 diff --git a/readme.txt b/readme.txt index 10f23c6f..ded8b401 100644 --- a/readme.txt +++ b/readme.txt @@ -2,7 +2,7 @@ Contributors: justlevine, kellenmace, mtdbyanechko, tinytoolbox Tags: Forms, GraphQL, Gatsby, Headless, GF, Gravity, WPGraphQL, React Requires at least: 5.4.1 -Tested up to: 6.2.2 +Tested up to: 6.3.1 Requires PHP: 7.4 Requires Gravity Forms: 2.5.0 Requires WPGraphQL: 1.9.0 diff --git a/wp-graphql-gravity-forms.php b/wp-graphql-gravity-forms.php index 6e437e8e..8b77fe5d 100644 --- a/wp-graphql-gravity-forms.php +++ b/wp-graphql-gravity-forms.php @@ -11,7 +11,7 @@ * Text Domain: wp-graphql-gravity-forms * Domain Path: /languages * Requires at least: 5.4.1 - * Tested up to: 6.2.2 + * Tested up to: 6.3.1 * Requires PHP: 7.4 * WPGraphQL requires at least: 1.9.0 * GravityForms requires at least: 2.5.0