Skip to content

Commit 29705f1

Browse files
committed
minor #1185 [CI] Simplify bridge test matrix to 8.2 lowest, 8.2 highest & 8.5 highest only (OskarStark)
This PR was merged into the main branch. Discussion ---------- [CI] Simplify bridge test matrix to `8.2 lowest`, `8.2 highest` & `8.5 highest` only | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | Docs? | no | Issues | -- | License | MIT Commits ------- 8850777 [CI] Simplify bridge test matrix
2 parents 2999cd4 + 8850777 commit 29705f1

File tree

2 files changed

+19
-71
lines changed

2 files changed

+19
-71
lines changed

.github/workflows/build-matrix.yaml

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,12 @@ on:
1515
store-bridges:
1616
description: 'List of store bridges'
1717
value: ${{ jobs.matrix.outputs.store-bridges }}
18-
store-bridges-include:
19-
description: 'Store bridge includes for test matrix'
20-
value: ${{ jobs.matrix.outputs.store-bridges-include }}
2118
tool-bridges:
2219
description: 'List of tool bridges'
2320
value: ${{ jobs.matrix.outputs.tool-bridges }}
24-
tool-bridges-include:
25-
description: 'Tool bridge includes for test matrix'
26-
value: ${{ jobs.matrix.outputs.tool-bridges-include }}
2721
platform-bridges:
2822
description: 'List of platform bridges'
2923
value: ${{ jobs.matrix.outputs.platform-bridges }}
30-
platform-bridges-include:
31-
description: 'Platform bridge includes for test matrix'
32-
value: ${{ jobs.matrix.outputs.platform-bridges-include }}
3324

3425
jobs:
3526
matrix:
@@ -40,11 +31,8 @@ jobs:
4031
packages-include: ${{ steps.set-matrix.outputs.packages-include }}
4132
bridges: ${{ steps.set-matrix.outputs.bridges }}
4233
store-bridges: ${{ steps.set-matrix.outputs.store-bridges }}
43-
store-bridges-include: ${{ steps.set-matrix.outputs.store-bridges-include }}
4434
tool-bridges: ${{ steps.set-matrix.outputs.tool-bridges }}
45-
tool-bridges-include: ${{ steps.set-matrix.outputs.tool-bridges-include }}
4635
platform-bridges: ${{ steps.set-matrix.outputs.platform-bridges }}
47-
platform-bridges-include: ${{ steps.set-matrix.outputs.platform-bridges-include }}
4836
steps:
4937
- name: Checkout
5038
uses: actions/checkout@v6
@@ -98,40 +86,11 @@ jobs:
9886
')
9987
echo "packages-include=$PACKAGES_INCLUDE" >> $GITHUB_OUTPUT
10088
101-
# Store bridge includes
102-
STORE_BRIDGES_INCLUDE=$(echo "$STORE_BRIDGES" | jq -c '
103-
map(del(.type)) as $bridges |
104-
($bridges | map(. + {"php-version": "8.2", "dependency-version": "lowest"})) +
105-
($bridges | map(. + {"php-version": "8.2", "symfony-version": "7.4.*"})) +
106-
($bridges | map(. + {"php-version": "8.5", "symfony-version": "8.0.*"}))
107-
| map({bridge: {component: .component, bridge: .bridge}} + (. | del(.component, .bridge)))
108-
')
109-
echo "store-bridges-include=$STORE_BRIDGES_INCLUDE" >> $GITHUB_OUTPUT
110-
111-
# Tool bridge includes
112-
TOOL_BRIDGES_INCLUDE=$(echo "$TOOL_BRIDGES" | jq -c '
113-
map(del(.type)) as $bridges |
114-
($bridges | map(. + {"php-version": "8.2", "dependency-version": "lowest"})) +
115-
($bridges | map(. + {"php-version": "8.2", "symfony-version": "7.4.*"})) +
116-
($bridges | map(. + {"php-version": "8.5", "symfony-version": "8.0.*"}))
117-
| map({bridge: {component: .component, bridge: .bridge}} + (. | del(.component, .bridge)))
118-
')
119-
echo "tool-bridges-include=$TOOL_BRIDGES_INCLUDE" >> $GITHUB_OUTPUT
120-
121-
# Platform bridge includes
122-
PLATFORM_BRIDGES_INCLUDE=$(echo "$PLATFORM_BRIDGES" | jq -c '
123-
map({bridge: .bridge}) as $bridges |
124-
($bridges | map(. + {"php-version": "8.2", "dependency-version": "lowest"})) +
125-
($bridges | map(. + {"php-version": "8.2", "symfony-version": "7.4.*"})) +
126-
($bridges | map(. + {"php-version": "8.5", "symfony-version": "8.0.*"}))
127-
| map({bridge: {bridge: .bridge}} + (. | del(.bridge)))
128-
')
129-
echo "platform-bridges-include=$PLATFORM_BRIDGES_INCLUDE" >> $GITHUB_OUTPUT
130-
13189
# Pretty print
13290
echo "::group::Packages"
13391
echo "$PACKAGES" | jq .
13492
echo "::endgroup::"
13593
echo "::group::Bridges"
13694
echo "$BRIDGES" | jq .
13795
echo "::endgroup::"
96+

.github/workflows/tests.yaml

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,18 @@ jobs:
7070
run: cd src/${{ matrix.package.path }} && vendor/bin/phpunit
7171

7272
store-bridges:
73-
name: Unit / Store / ${{ matrix.bridge.bridge }} / PHP ${{ matrix.php-version }}${{ matrix.dependency-version == 'lowest' && ' / lowest' || '' }}${{ matrix.symfony-version && format(' / Symfony {0}', matrix.symfony-version) || '' }}
73+
name: Unit / Store / ${{ matrix.bridge.bridge }} / PHP ${{ matrix.php-version }}${{ matrix.dependency-version == 'lowest' && ' / lowest' || '' }}
7474
needs: matrix
7575
runs-on: ubuntu-latest
7676
strategy:
7777
fail-fast: false
7878
matrix:
7979
bridge: ${{ fromJson(needs.matrix.outputs.store-bridges) }}
8080
php-version: ['8.2', '8.5']
81-
dependency-version: ['']
82-
symfony-version: ['']
83-
include: ${{ fromJson(needs.matrix.outputs.store-bridges-include) }}
84-
85-
env:
86-
SYMFONY_REQUIRE: ${{ matrix.symfony-version || '>=7.4' }}
81+
dependency-version: ['highest']
82+
include:
83+
- php-version: '8.2'
84+
dependency-version: 'lowest'
8785

8886
steps:
8987
- name: Checkout
@@ -105,26 +103,24 @@ jobs:
105103
uses: ramsey/composer-install@v3
106104
with:
107105
working-directory: src/${{ matrix.bridge.component }}/src/Bridge/${{ matrix.bridge.bridge }}
108-
dependency-versions: ${{ matrix.dependency-version || 'highest' }}
106+
dependency-versions: ${{ matrix.dependency-version }}
109107

110108
- name: Run PHPUnit
111109
run: cd src/${{ matrix.bridge.component }}/src/Bridge/${{ matrix.bridge.bridge }} && vendor/bin/phpunit
112110

113111
tool-bridges:
114-
name: Unit / Tool / ${{ matrix.bridge.bridge }} / PHP ${{ matrix.php-version }}${{ matrix.dependency-version == 'lowest' && ' / lowest' || '' }}${{ matrix.symfony-version && format(' / Symfony {0}', matrix.symfony-version) || '' }}
112+
name: Unit / Tool / ${{ matrix.bridge.bridge }} / PHP ${{ matrix.php-version }}${{ matrix.dependency-version == 'lowest' && ' / lowest' || '' }}
115113
needs: matrix
116114
runs-on: ubuntu-latest
117115
strategy:
118116
fail-fast: false
119117
matrix:
120118
bridge: ${{ fromJson(needs.matrix.outputs.tool-bridges) }}
121119
php-version: ['8.2', '8.5']
122-
dependency-version: ['']
123-
symfony-version: ['']
124-
include: ${{ fromJson(needs.matrix.outputs.tool-bridges-include) }}
125-
126-
env:
127-
SYMFONY_REQUIRE: ${{ matrix.symfony-version || '>=7.4' }}
120+
dependency-version: ['highest']
121+
include:
122+
- php-version: '8.2'
123+
dependency-version: 'lowest'
128124

129125
steps:
130126
- name: Checkout
@@ -146,26 +142,24 @@ jobs:
146142
uses: ramsey/composer-install@v3
147143
with:
148144
working-directory: src/${{ matrix.bridge.component }}/src/Bridge/${{ matrix.bridge.bridge }}
149-
dependency-versions: ${{ matrix.dependency-version || 'highest' }}
145+
dependency-versions: ${{ matrix.dependency-version }}
150146

151147
- name: Run PHPUnit
152148
run: cd src/${{ matrix.bridge.component }}/src/Bridge/${{ matrix.bridge.bridge }} && vendor/bin/phpunit
153149

154150
platform-bridges:
155-
name: Unit / Platform / ${{ matrix.bridge.bridge }} / PHP ${{ matrix.php-version }}${{ matrix.dependency-version == 'lowest' && ' / lowest' || '' }}${{ matrix.symfony-version && format(' / Symfony {0}', matrix.symfony-version) || '' }}
151+
name: Unit / Platform / ${{ matrix.bridge.bridge }} / PHP ${{ matrix.php-version }}${{ matrix.dependency-version == 'lowest' && ' / lowest' || '' }}
156152
needs: matrix
157153
runs-on: ubuntu-latest
158154
strategy:
159155
fail-fast: false
160156
matrix:
161157
bridge: ${{ fromJson(needs.matrix.outputs.platform-bridges) }}
162158
php-version: ['8.2', '8.5']
163-
dependency-version: ['']
164-
symfony-version: ['']
165-
include: ${{ fromJson(needs.matrix.outputs.platform-bridges-include) }}
166-
167-
env:
168-
SYMFONY_REQUIRE: ${{ matrix.symfony-version || '>=7.4' }}
159+
dependency-version: ['highest']
160+
include:
161+
- php-version: '8.2'
162+
dependency-version: 'lowest'
169163

170164
steps:
171165
- name: Checkout
@@ -183,11 +177,6 @@ jobs:
183177
tools: flex
184178
extensions: ${{ env.REQUIRED_PHP_EXTENSIONS }}
185179

186-
# Deptrac does not support Symfony 8.0 yet
187-
- name: Remove deptrac (Symfony 8.0)
188-
if: matrix.symfony-version == '8.0.*'
189-
run: composer remove --dev deptrac/deptrac --no-update
190-
191180
- name: Install root dependencies
192181
uses: ramsey/composer-install@v3
193182

@@ -202,7 +191,7 @@ jobs:
202191
uses: ramsey/composer-install@v3
203192
with:
204193
working-directory: src/platform/src/Bridge/${{ matrix.bridge.bridge }}
205-
dependency-versions: ${{ matrix.dependency-version || 'highest' }}
194+
dependency-versions: ${{ matrix.dependency-version }}
206195

207196
- name: Run PHPUnit
208197
run: cd src/platform/src/Bridge/${{ matrix.bridge.bridge }} && vendor/bin/phpunit

0 commit comments

Comments
 (0)