Skip to content

Commit

Permalink
chore: bump tested WP version to v6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
justlevine committed Nov 4, 2022
1 parent d155659 commit 585fd9b
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: Check code
strategy:
matrix:
php: [ 8.0 ]
php: [ 8.1 ]

steps:
- name: Cancel previous runs of this workflow (pull requests only)
Expand Down
20 changes: 7 additions & 13 deletions .github/workflows/testing-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,18 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ '7.4', '7.3' ]
wordpress: [ '5.9', '5.8', '5.7.2', '5.6.2' ]
php: [ '8.0', '7.4', '7.3' ]
wordpress: [ '6.1', '6.0', '5.9', '5.8', '5.7', '5.6' ]
include:
- php: '8.1'
wordpress: '6.1'
multisite: true
- php: '8.1'
wordpress: '6.0'
- php: '8.0'
wordpress: '6.0'
- php: '7.4'
wordpress: '6.0'
- php: '8.0'
wordpress: '5.9'
- php: '8.0'
- php: '8.1'
wordpress: '5.9'
multisite: 1
- php: '8.0'
wordpress: '5.8'
- php: '7.4'
wordpress: '5.8'
wordpress: '6.1'
coverage: 1

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wordpress-coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: PHPCS
strategy:
matrix:
php: [ 8.0 ]
php: [ 8.1 ]

steps:
- name: Cancel previous runs of this workflow (pull requests only)
Expand Down
12 changes: 6 additions & 6 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=5.9 PHP_VERSION=8.0 composer build-app";
echo " WP_VERSION=5.9 PHP_VERSION=8.0 composer run-app";
echo " WP_VERSION=6.1 PHP_VERSION=8.1 composer build-app";
echo " WP_VERSION=6.1 PHP_VERSION=8.1 composer run-app";
echo "";
echo " WP_VERSION=5.9 PHP_VERSION=8.0 bin/run-docker.sh build -a";
echo " WP_VERSION=5.9 PHP_VERSION=8.0 bin/run-docker.sh run -a";
echo " WP_VERSION=6.1 PHP_VERSION=8.1 bin/run-docker.sh build -a";
echo " WP_VERSION=6.1 PHP_VERSION=8.1 bin/run-docker.sh run -a";
exit 1
}

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

TAG=${TAG-latest}
WP_VERSION=${WP_VERSION-5.9}
PHP_VERSION=${PHP_VERSION-8.0}
WP_VERSION=${WP_VERSION-6.1}
PHP_VERSION=${PHP_VERSION-8.1}

BUILD_NO_CACHE=${BUILD_NO_CACHE-}

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
app:
depends_on:
- app_db
image: wp-graphql:latest-wp${WP_VERSION-5.9}-php${PHP_VERSION-8.0}
image: wp-graphql:latest-wp${WP_VERSION-6.1}-php${PHP_VERSION-8.1}
volumes:
- '.:/var/www/html/wp-content/plugins/wp-graphql'
- './.log/app:/var/log/apache2'
Expand Down Expand Up @@ -34,7 +34,7 @@ services:
testing:
depends_on:
- app_db
image: wp-graphql-testing:latest-wp${WP_VERSION-5.9}-php${PHP_VERSION-8.0}
image: wp-graphql-testing:latest-wp${WP_VERSION-6.1}-php${PHP_VERSION-8.1}
volumes:
- '.:/var/www/html/wp-content/plugins/wp-graphql'
- './.log/testing:/var/log/apache2'
Expand Down
2 changes: 1 addition & 1 deletion docs/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ PHP_VERSION=7.4 composer build-test
Build the environment with specific version of WordPress:

```shell
WP_VERSION=6.0 composer build-test
WP_VERSION=6.1 composer build-test
```

```shell
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: jasonbahl, tylerbarnes1, ryankanner, hughdevore, chopinbach, kidunot89
Tags: GraphQL, API, Gatsby, Headless, Decoupled, React, Nextjs, Vue, Apollo, REST, JSON, HTTP, Remote, Query Language
Requires at least: 5.0
Tested up to: 5.9.1
Tested up to: 6.1
Requires PHP: 7.1
Stable tag: 1.12.0
License: GPL-3
Expand Down
2 changes: 1 addition & 1 deletion wp-graphql.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Text Domain: wp-graphql
* Domain Path: /languages/
* Requires at least: 5.0
* Tested up to: 5.9.1
* Tested up to: 6.1
* Requires PHP: 7.1
* License: GPL-3
* License URI: https://www.gnu.org/licenses/gpl-3.0.html
Expand Down

0 comments on commit 585fd9b

Please sign in to comment.