Skip to content

Commit 24bd28b

Browse files
jasonbahljasonbahl
authored
Merge pull request #3097 from wp-graphql/release/v1.23.0
release: v1.23.0
2 parents 181c9e0 + 8a3d8f8 commit 24bd28b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+16810
-44183
lines changed

‎.github/workflows/build-graphiql.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ jobs:
1818
build-graphiql:
1919
name: Build GraphiQL
2020
runs-on: ubuntu-latest
21+
2122
steps:
2223
- name: Checkout
23-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2425
with:
2526
ref: ${{ github.head_ref }}
2627
token: ${{ secrets.PAT }}

‎.github/workflows/code-quality.yml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,31 @@ on:
1010
- develop
1111
- master
1212

13+
# Cancel previous workflow run groups that have not completed.
14+
concurrency:
15+
# Group workflow runs by workflow name, along with the head branch ref of the pull request
16+
# or otherwise the branch or tag ref.
17+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
18+
cancel-in-progress: true
19+
1320
jobs:
1421
run:
1522
runs-on: ubuntu-latest
1623
name: Check code
17-
strategy:
18-
matrix:
19-
php: [ 8.1 ]
2024

2125
steps:
22-
- name: Cancel previous runs of this workflow (pull requests only)
23-
if: ${{ github.event_name == 'pull_request' }}
24-
uses: styfle/[email protected]
25-
with:
26-
access_token: ${{ github.token }}
27-
2826
- name: Checkout
29-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
3028

3129
- name: Setup PHP
3230
uses: shivammathur/setup-php@v2
3331
with:
34-
php-version: ${{ matrix.php }}
32+
php-version: 8.2
3533
tools: composer:v2
3634
coverage: none
3735

3836
- name: Install dependencies
39-
uses: ramsey/composer-install@v2
37+
uses: ramsey/composer-install@v3
4038
with:
4139
composer-options: "--no-progress"
4240

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ on:
2020
schedule:
2121
- cron: '15 21 * * 1'
2222

23+
24+
# Cancel previous workflow run groups that have not completed.
25+
concurrency:
26+
# Group workflow runs by workflow name, along with the head branch ref of the pull request
27+
# or otherwise the branch or tag ref.
28+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
29+
cancel-in-progress: true
30+
2331
jobs:
2432
analyze:
2533
name: Analyze
@@ -38,7 +46,7 @@ jobs:
3846

3947
steps:
4048
- name: Checkout repository
41-
uses: actions/checkout@v3
49+
uses: actions/checkout@v4
4250

4351
# Initializes the CodeQL tools for scanning.
4452
- name: Initialize CodeQL

‎.github/workflows/deploy-docker-image.yml‎

Lines changed: 51 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,56 +14,75 @@ jobs:
1414
strategy:
1515
matrix:
1616
php: [ '8.1', '8.0', '7.4', '7.3' ]
17-
wordpress: [ '6.2', '6.1', '6.0', '5.9', '5.8', '5.7.2', '5.6', '5.5.3' ]
17+
wordpress: [ '6.5', '6.4', '6.3', '6.2', '6.1', '6.0', '5.9', '5.8', '5.7', '5.6', '5.5' ]
1818
include:
19-
- php: '8.2'
20-
wordpress: '6.1'
21-
- php: '8.2'
22-
wordpress: '6.2'
23-
- php: '8.2'
24-
wordpress: '6.4.0'
25-
- php: '8.2'
26-
wordpress: '6.3'
27-
- php: '8.1'
28-
wordpress: '6.3'
19+
# WordPress versions above the PHP testing matrix.
20+
- wordpress: '6.5'
21+
php: '8.3'
22+
- wordpress: '6.5'
23+
php: '8.2'
24+
- wordpress: '6.4'
25+
php: '8.2'
26+
- wordpress: '6.3'
27+
php: '8.2'
28+
- wordpress: '6.2'
29+
php: '8.2'
30+
- wordpress: '6.1'
31+
php: '8.2'
2932
exclude:
30-
- php: '8.1'
31-
wordpress: '5.5.3'
32-
- php: '8.1'
33-
wordpress: '5.6'
34-
- php: '8.1'
35-
wordpress: '5.7.2'
36-
- php: '8.0'
37-
wordpress: '5.5.3'
38-
- php: '7.3'
39-
wordpress: '6.0'
40-
- php: '7.3'
41-
wordpress: '6.1'
42-
- php: '7.3'
43-
wordpress: '6.2'
44-
# This is a temporary exclusion until a php74 image is released. See #2780
45-
- php: '7.4'
46-
wordpress: '6.2'
33+
# WordPress versions that don't have a PHP Docker image available (too new)
34+
- wordpress: '6.5'
35+
php: '8.0'
36+
- wordpress: '6.5'
37+
php: '7.4'
38+
- wordpress: '6.5'
39+
php: '7.3'
40+
- wordpress: '6.4'
41+
php: '7.4'
42+
- wordpress: '6.4'
43+
php: '7.3'
44+
- wordpress: '6.3'
45+
php: '7.4'
46+
- wordpress: '6.3'
47+
php: '7.3'
48+
- wordpress: '6.2'
49+
php: '7.4'
50+
- wordpress: '6.2'
51+
php: '7.3'
52+
- wordpress: '6.1'
53+
php: '7.3'
54+
- wordpress: '6.0'
55+
php: '7.3'
56+
# WordPress versions that don't support PHP versions in the matrix (too old)
57+
- wordpress: '5.7'
58+
php: '8.1'
59+
- wordpress: '5.6'
60+
php: '8.1'
61+
- wordpress: '5.5'
62+
php: '8.1'
63+
- wordpress: '5.5'
64+
php: '8.0'
65+
4766
fail-fast: false
4867
name: WordPress ${{ matrix.wordpress }} on PHP ${{ matrix.php }}
4968
steps:
5069
- name: Checkout
51-
uses: actions/checkout@v3
70+
uses: actions/checkout@v4
5271

5372
# Use magic to get the tag number from /ref/heads/v0.1.2 in GITHUB_REF
5473
- name: Get the version
5574
id: vars
5675
run: echo "tag=$(echo ${GITHUB_REF:11})" >> $GITHUB_OUTPUT
5776

5877
- name: Log in to the Container registry
59-
uses: docker/login-action@v2
78+
uses: docker/login-action@v3
6079
with:
6180
registry: ghcr.io
6281
username: ${{ github.actor }}
6382
password: ${{ secrets.GITHUB_TOKEN }}
6483

6584
- name: Build and push Docker image
66-
uses: docker/build-push-action@v4
85+
uses: docker/build-push-action@v5
6786
with:
6887
context: .
6988
push: true
@@ -76,7 +95,7 @@ jobs:
7695
WP_VERSION=${{ matrix.wordpress }}
7796
7897
- name: Build and push Docker testing image
79-
uses: docker/build-push-action@v4
98+
uses: docker/build-push-action@v5
8099
with:
81100
context: .
82101
push: true

‎.github/workflows/deploy-to-wordpress.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,23 @@ name: Deploy to WordPress.org
22
on:
33
release:
44
types: [ published ]
5+
56
jobs:
67
tag:
78
name: New release
89
runs-on: ubuntu-latest
10+
911
steps:
1012
- name: Checkout
11-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
14+
1215
- name: Setup PHP
1316
uses: shivammathur/setup-php@v2
1417
with:
15-
php-version: 7.4
18+
php-version: 8.2
1619
extensions: mbstring, intl
1720
tools: composer
21+
1822
- name: Install PHP dependencies
1923
run: |
2024
composer install --no-dev --optimize-autoloader
@@ -26,16 +30,19 @@ jobs:
2630
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
2731
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
2832
SLUG: wp-graphql
33+
2934
- name: Create Artifact
3035
run: |
3136
composer run-script zip
37+
3238
- name: Upload artifact
33-
uses: actions/upload-artifact@v2
39+
uses: actions/upload-artifact@v4
3440
with:
3541
name: wp-graphql
3642
path: plugin-build/wp-graphql.zip
43+
3744
- name: Upload release asset
38-
uses: softprops/action-gh-release@v1
45+
uses: softprops/action-gh-release@v2
3946
with:
4047
files: plugin-build/wp-graphql.zip
4148
env:

‎.github/workflows/graphiql-e2e-tests.yml‎

Lines changed: 62 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,67 @@
11
name: GraphiQL End-to-End Tests
22

33
on:
4-
workflow_dispatch:
4+
push:
5+
branches:
6+
- develop
7+
- master
8+
pull_request:
9+
branches:
10+
- develop
11+
- master
12+
paths:
13+
- '**.js'
14+
- '.github/workflows/*.yml'
15+
- '!docs/**'
16+
17+
# Cancel previous workflow run groups that have not completed.
18+
concurrency:
19+
# Group workflow runs by workflow name, along with the head branch ref of the pull request
20+
# or otherwise the branch or tag ref.
21+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
22+
cancel-in-progress: true
523

624
jobs:
7-
admin:
8-
name: GraphiQL E2E Tests
9-
runs-on: ubuntu-latest
10-
if: ${{ github.repository == 'wp-graphql/wp-graphql' || github.event_name == 'pull_request' }}
11-
strategy:
12-
fail-fast: false
13-
matrix:
14-
node: ['16.13.0']
15-
16-
steps:
17-
- name: Cancel previous runs of this workflow (pull requests only)
18-
if: ${{ github.event_name == 'pull_request' }}
19-
uses: styfle/[email protected]
20-
with:
21-
access_token: ${{ github.token }}
22-
23-
- name: Checkout
24-
uses: actions/checkout@v3
25-
26-
- name: Use desired version of NodeJS
27-
uses: actions/setup-node@v3
28-
with:
29-
node-version: ${{ matrix.node }}
30-
cache: npm
31-
32-
- name: Setup PHP w/ Composer & WP-CLI
33-
uses: shivammathur/setup-php@v2
34-
with:
35-
php-version: 7.3
36-
extensions: mbstring, intl, bcmath, exif, gd, mysqli, opcache, zip, pdo_mysql
37-
coverage: none
38-
tools: composer, wp-cli
39-
40-
- name: Install Composer Dependencies
41-
run: |
42-
composer install --no-dev
43-
44-
- name: Install NPM Dependencies and Build the GraphiQL App
45-
id: install-and-build
46-
run: |
47-
npm ci && npm run build
48-
49-
- name: Install WordPress
50-
run: |
51-
npm run wp-env start
52-
- name: Running the tests
53-
run: |
54-
npm run test-e2e
25+
e2e-tests:
26+
name: E2E tests on Node ${{ matrix.node-version }}
27+
runs-on: ubuntu-latest
28+
29+
steps:
30+
- name: Checkout code
31+
uses: actions/checkout@v4
32+
33+
- name: Setup Node.js
34+
uses: actions/setup-node@v4
35+
with:
36+
node-version: 18
37+
38+
- name: Setup PHP
39+
uses: shivammathur/setup-php@v2
40+
with:
41+
php-version: 8.2
42+
extensions: mbstring, intl
43+
tools: composer
44+
45+
- name: Install dependencies
46+
uses: ramsey/composer-install@v3
47+
with:
48+
composer-options: "--no-progress"
49+
50+
- name: Install JavaScript dependencies
51+
run: npm ci
52+
53+
- name: Build Assets
54+
run: npm run build
55+
56+
- name: Install Playwright dependencies
57+
run: |
58+
npx playwright install chromium firefox webkit --with-deps
59+
60+
- name: Start WordPress Environment
61+
run: npm run wp-env -- start
62+
63+
- name: Run E2E tests
64+
run: npm run test:e2e
65+
66+
- name: Stop WordPress Environment
67+
run: npm run wp-env -- stop

0 commit comments

Comments
 (0)