Skip to content

Commit d26173e

Browse files
committed
fix: Pin MySQL 8.0, enable native auth, and optimize test matrix
- Pin MySQL to 8.0 to avoid 8.4 breaking changes - Enable mysql_native_password for client compatibility - Reduce test matrix from 7 WP versions to 2 WP × 2 PHP (5 jobs total) - Make PHP version configurable in Docker setup
1 parent bf823aa commit d26173e

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

.github/workflows/unit-test-plugin-nightly.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99

1010
jobs:
1111
unit_test_plugin:
12+
name: WP Nightly / PHP 8.3
1213
runs-on: ubuntu-22.04
1314

1415
steps:
@@ -19,7 +20,8 @@ jobs:
1920
working-directory: ./plugins/faustwp
2021
run: |
2122
docker compose build \
22-
--build-arg WP_VERSION=6.5
23+
--build-arg WP_VERSION=6.8 \
24+
--build-arg PHP_VERSION=8.3
2325
docker compose up -d
2426
2527
- name: Wait for db

.github/workflows/unit-test-plugin.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,25 @@ on:
99

1010
jobs:
1111
unit_test_plugin:
12-
name: WordPress ${{ matrix.wordpress }}
12+
name: WP ${{ matrix.wordpress }} / PHP ${{ matrix.php }}
1313
runs-on: ubuntu-22.04
1414
strategy:
1515
matrix:
16-
wordpress: [ '6.8', '6.7', '6.6', '6.5', '6.4', '6.3', '6.2']
16+
wordpress: ['6.8', '6.7']
17+
php: ['8.1', '8.3']
1718
steps:
1819
- name: Checkout
1920
uses: actions/checkout@v4
2021

2122
- name: Create Docker Containers
2223
env:
2324
WP_VERSION: ${{ matrix.wordpress }}
25+
PHP_VERSION: ${{ matrix.php }}
2426
working-directory: ./plugins/faustwp
2527
run: |
2628
docker compose build \
27-
--build-arg WP_VERSION=${{ matrix.wordpress }}
29+
--build-arg WP_VERSION=${{ matrix.wordpress }} \
30+
--build-arg PHP_VERSION=${{ matrix.php }}
2831
docker compose up -d
2932
3033
- name: Wait for db

plugins/faustwp/.docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG WP_VERSION
2+
ARG PHP_VERSION=8.2
23

3-
FROM wordpress:${WP_VERSION}-php8.2
4+
FROM wordpress:${WP_VERSION}-php${PHP_VERSION}
45

56
# Save the build args for use by the runtime environment
67
ENV WP_VERSION=${WP_VERSION}

plugins/faustwp/docker-compose.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ services:
22
wordpress:
33
build:
44
context: ./.docker
5-
image: faustwp:latest-wp-${WP_VERSION-latest}
5+
args:
6+
WP_VERSION: ${WP_VERSION:-6.8}
7+
PHP_VERSION: ${PHP_VERSION:-8.2}
8+
image: faustwp:wp-${WP_VERSION:-6.8}-php${PHP_VERSION:-8.2}
69
restart: always
710
ports:
811
- 8080:80

0 commit comments

Comments
 (0)