Skip to content

Commit f5bac61

Browse files
swissspidyclaudeCopilot
authored
Drop the environment matrix from the bundle integration tests (#71)
Co-authored-by: Claude Opus 5 <noreply@anthropic.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Claude <noreply@anthropic.com>
1 parent 2573b01 commit f5bac61

2 files changed

Lines changed: 16 additions & 44 deletions

File tree

.github/workflows/reusable-testing.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,17 @@ on:
1212
wp:
1313
type: string
1414
required: true
15+
# Retained as optional inputs rather than removed, so a database or object
16+
# cache leg can be reinstated without reshaping the workflow. The matrix no
17+
# longer varies them: storage backends are covered per-package.
1518
dbtype:
1619
type: string
17-
required: true
20+
required: false
21+
default: 'mysql'
1822
object_cache:
1923
type: string
20-
required: true
24+
required: false
25+
default: 'none'
2126
use-phar:
2227
type: boolean
2328
required: true
@@ -26,6 +31,9 @@ jobs:
2631
run-test:
2732
name: WP ${{ inputs.wp }} | PHP ${{ inputs.php }} | ${{ inputs.dbtype == 'sqlite' && 'SQLite' || inputs.dbtype == 'mysql' && 'MySQL' || 'MariaDB' }}${{ inputs.use-phar && ' (Phar)' || '' }}${{ inputs.object_cache == 'sqlite' && ' (Obj Cache)' || '' }}
2833
runs-on: ubuntu-22.04
34+
# In this repository’s current matrix, every leg gates. The `continue-on-error`
35+
# condition is retained so callers can still run optional SQLite/object-cache
36+
# legs without reshaping the workflow, if needed.
2937
continue-on-error: ${{ inputs.dbtype == 'sqlite' || inputs.object_cache == 'sqlite' }}
3038
timeout-minutes: 90
3139

.github/workflows/testing.yml

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ jobs:
2828
matrix:
2929
php: ['7.4', '8.5']
3030
wp: ['latest', 'trunk']
31-
dbtype: ['mysql', 'sqlite']
32-
object_cache: ['none', 'sqlite']
3331
use-phar: [false, true]
3432
test-package:
3533
- wp-cli-bundle
@@ -64,53 +62,19 @@ jobs:
6462
- super-admin-command
6563
- widget-command
6664
exclude:
67-
# Object cache runs only on sqlite dbtype
68-
- dbtype: mysql
69-
object_cache: sqlite
70-
71-
# SQLite runs only on WP latest and PHP 8.5
72-
- dbtype: sqlite
73-
wp: trunk
74-
- dbtype: sqlite
75-
php: '7.4'
76-
77-
# Object cache runs only with WP latest
78-
- object_cache: sqlite
79-
wp: trunk
80-
81-
# A1: object_cache=sqlite only on PHP 8.5
65+
# PHP 7.4 is covered per-package across the full version matrix. Keep a
66+
# single bundle-integration leg for it — enough to catch a package
67+
# raising its PHP requirement and breaking `composer install` for the
68+
# bundle, which is the one failure only this repository sees.
8269
- php: '7.4'
83-
object_cache: sqlite
84-
85-
# Phar and source are separate dimensions, not aliases for a WP
86-
# version. Previously `use-phar: true` was excluded on trunk and
87-
# `use-phar: false` on latest, which made the two fully determined by
88-
# each other: the Phar was only ever tested against WP latest and
89-
# source only against trunk, so source-on-latest — the ordinary local
90-
# setup — went untested entirely.
91-
#
92-
# Cross them instead, dropping only the combinations that add no
93-
# signal, which keeps the run under the 256-job matrix cap. What this
94-
# buys is source against WP latest, and the Phar against trunk as an
95-
# early warning that a WP change has broken the released binary.
96-
# Neither of those runs with continue-on-error, so both can fail the
97-
# build.
70+
wp: trunk
9871
- php: '7.4'
99-
wp: latest
100-
use-phar: false
101-
- dbtype: sqlite
10272
use-phar: false
103-
104-
# Limit ancient php on trunk
105-
- php: '7.4'
106-
wp: trunk
107-
73+
10874
uses: ./.github/workflows/reusable-testing.yml
10975
with:
11076
test-package: ${{ matrix.test-package }}
11177
php: ${{ matrix.php }}
11278
wp: ${{ matrix.wp }}
113-
dbtype: ${{ matrix.dbtype }}
114-
object_cache: ${{ matrix.object_cache }}
11579
use-phar: ${{ matrix.use-phar }}
11680

0 commit comments

Comments
 (0)