Skip to content

Commit f09ca3e

Browse files
committed
Remove conditional PHPUnit paths from GHA workflows
1 parent b380380 commit f09ca3e

File tree

2 files changed

+5
-18
lines changed

2 files changed

+5
-18
lines changed

.github/workflows/quicktest.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,9 @@ jobs:
9494
id: phpunit_version
9595
run: echo "VERSION=$(vendor/bin/phpunit --version | grep --only-matching --max-count=1 --extended-regexp '\b[0-9]+\.[0-9]+')" >> $GITHUB_OUTPUT
9696

97-
- name: Run the unit tests (PHPUnit < 10)
98-
if: ${{ ! startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) }}
97+
- name: Run the unit tests
9998
run: composer test
10099

101-
- name: Run the unit tests (PHPUnit 10+)
102-
if: ${{ startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) }}
103-
run: composer test10
104-
105100
- name: Stop proxy server
106101
continue-on-error: true
107102
run: |

.github/workflows/test.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,22 +118,14 @@ jobs:
118118
id: phpunit_version
119119
run: echo "VERSION=$(vendor/bin/phpunit --version | grep --only-matching --max-count=1 --extended-regexp '\b[0-9]+\.[0-9]+')" >> $GITHUB_OUTPUT
120120

121-
- name: Run the unit tests, no code coverage (PHPUnit < 10)
122-
if: ${{ matrix.coverage == false && ! startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) }}
121+
- name: Run the unit tests, no code coverage
122+
if: ${{ matrix.coverage == false }}
123123
run: composer test
124124

125-
- name: Run the unit tests, no code coverage (PHPUnit 10+)
126-
if: ${{ matrix.coverage == false && startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) }}
127-
run: composer test10
128-
129-
- name: Run the unit tests with code coverage (PHPUnit < 10)
130-
if: ${{ matrix.coverage == true && ! startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) }}
125+
- name: Run the unit tests with code coverage
126+
if: ${{ matrix.coverage == true }}
131127
run: composer coverage -- --coverage-clover clover.xml
132128

133-
- name: Run the unit tests with code coverage (PHPUnit 10+)
134-
if: ${{ matrix.coverage == true && startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) }}
135-
run: composer coverage10 -- --coverage-clover clover.xml
136-
137129
- name: Stop proxy server
138130
continue-on-error: true
139131
run: |

0 commit comments

Comments
 (0)