Skip to content

Commit

Permalink
Merge branch 'develop' into fix/form-fields-page-filter
Browse files Browse the repository at this point in the history
  • Loading branch information
justlevine committed Feb 4, 2024
2 parents 150d184 + a491c17 commit 4e55091
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/integration-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,18 @@ jobs:
strategy:
matrix:
php: [ '8.0', '7.4' ]
wordpress: [ '6.3', '6.2', '6.1', '6.0', '5.9', '5.8', '5.7' ]
wordpress: [ '6.4','6.3', '6.2', '6.1', '6.0', '5.9', '5.8', '5.7' ]
include:
- php: '8.1'
wordpress: '6.3'
wordpress: '6.4'
coverage: 1
- php: '8.1'
wordpress: '6.3'
- php: '8.1'
wordpress: '6.2'
exclude:
- php: '7.4'
wordpress: '6.4'
- php: '7.4'
wordpress: '6.3'
- php: '7.4'
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- fix: Ensure `EmailField` inputs are hydrated when Email Confirmation is disabled. H/t @Gytjarek.
- fix: Correctly use filtered form fields when preparing the connection data. H/t @samuelhadsall
- chore: Test compatibility with WordPress 6.4.x

## v0.12.4

Expand Down
10 changes: 5 additions & 5 deletions bin/run-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ print_usage_instructions() {
echo " composer build-app"
echo " composer run-app"
echo ""
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 " WP_VERSION=6.4 PHP_VERSION=8.1 composer build-app"
echo " WP_VERSION=6.4 PHP_VERSION=8.1 composer run-app"
echo ""
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"
echo " WP_VERSION=6.4 PHP_VERSION=8.1 bin/run-docker.sh build -a"
echo " WP_VERSION=6.4 PHP_VERSION=8.1 bin/run-docker.sh run -a"
exit 1
}

Expand All @@ -29,7 +29,7 @@ if [ $# -eq 0 ]; then
fi

TAG=${TAG-latest}
WP_VERSION=${WP_VERSION-6.3}
WP_VERSION=${WP_VERSION-6.4}
PHP_VERSION=${PHP_VERSION-8.1}

BUILD_NO_CACHE=${BUILD_NO_CACHE-}
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.1
Tested up to: 6.4.3
Requires PHP: 7.4
Requires Gravity Forms: 2.5.0
Requires WPGraphQL: 1.9.0
Expand Down
2 changes: 1 addition & 1 deletion wp-graphql-gravity-forms.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Text Domain: wp-graphql-gravity-forms
* Domain Path: /languages
* Requires at least: 5.4.1
* Tested up to: 6.3.1
* Tested up to: 6.4.3
* Requires PHP: 7.4
* WPGraphQL requires at least: 1.9.0
* GravityForms requires at least: 2.5.0
Expand Down

0 comments on commit 4e55091

Please sign in to comment.