Skip to content

Commit fe4b6aa

Browse files
committed
Fix up handling of codecov variables
1 parent b913e2b commit fe4b6aa

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

.github/workflows/tests.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ env:
5252
IMAGE_ICC: ${{ inputs.IMAGE_ICC == '1' && '1' || '0' }}
5353
EPV: ${{ inputs.EPV == '1' && '1' || '0' }}
5454
EXECUTABLE_FILES: ${{ inputs.EXECUTABLE_FILES == '1' && '1' || '0' }}
55-
CODECOV: ${{ inputs.CODECOV == '1' && '1' || '0' }}
5655
PHPBB_BRANCH: ${{ inputs.PHPBB_BRANCH }}
5756

5857
jobs:
@@ -150,8 +149,8 @@ jobs:
150149
db: "mysql:5.6"
151150
- php: '7.2'
152151
db: "mysql:5.7"
153-
COVERAGE: 1
154-
db_alias: "mysql:5.7 with Coverage"
152+
COVERAGE: ${{ inputs.CODECOV == '1' && '1' || '0' }}
153+
db_alias: ${{ inputs.CODECOV == '1' && 'mysql:5.7 with Coverage' || 'mysql:5.7' }}
155154
- php: '7.3'
156155
db: "mysql:5.7"
157156
- php: '7.4'
@@ -220,7 +219,7 @@ jobs:
220219
with:
221220
php-version: ${{ matrix.php }}
222221
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
223-
coverage: ${{ matrix.COVERAGE == 1 && env.CODECOV == '1' && 'xdebug' || 'none' }}
222+
coverage: ${{ matrix.COVERAGE == '1' && 'xdebug' || 'none' }}
224223

225224
- name: Setup environment for phpBB
226225
env:
@@ -240,7 +239,7 @@ jobs:
240239
- name: Setup PHPUnit files
241240
env:
242241
DB: ${{steps.database-type.outputs.db}}
243-
COVERAGE: ${{ matrix.COVERAGE == 1 && env.CODECOV == '1' && '1' || '0' }}
242+
COVERAGE: ${{ matrix.COVERAGE == '1' && '1' || '0' }}
244243
run: |
245244
if [ $COVERAGE == '1' ]
246245
then
@@ -253,7 +252,7 @@ jobs:
253252
- name: Run unit tests
254253
env:
255254
DB: ${{steps.database-type.outputs.db}}
256-
COVERAGE: ${{ matrix.COVERAGE == 1 && env.CODECOV == '1' && '1' || '0' }}
255+
COVERAGE: ${{ matrix.COVERAGE == '1' && '1' || '0' }}
257256
run: |
258257
if [ $COVERAGE == '1' ]
259258
then
@@ -264,7 +263,7 @@ jobs:
264263
working-directory: ./phpBB3
265264

266265
- name: Send code coverage
267-
if: ${{ matrix.COVERAGE == 1 && env.CODECOV == '1' }}
266+
if: ${{ matrix.COVERAGE == '1' }}
268267
uses: codecov/codecov-action@v5
269268
with:
270269
token: ${{ secrets.CODECOV_TOKEN }}

0 commit comments

Comments
 (0)