Skip to content

Commit 8918b7c

Browse files
SpudsSpuds
committed
! try action
1 parent 862a83e commit 8918b7c

7 files changed

+38
-23
lines changed

‎.github/phpunit-mariadb.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<directory suffix=".php">../sources/ext</directory>
3131
</exclude>
3232
<report>
33-
<clover outputFile="/tmp/madb.xml"/>
33+
<clover outputFile="/home/runner/work/Elkarte/Elkarte/elkarte/tmp/db.xml"/>
3434
</report>
3535
</coverage>
3636

‎.github/phpunit-mysql.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<directory suffix=".php">../sources/ext</directory>
3131
</exclude>
3232
<report>
33-
<clover outputFile="/tmp/mydb.xml"/>
33+
<clover outputFile="/home/runner/work/Elkarte/Elkarte/elkarte/tmp/db.xml"/>
3434
</report>
3535
</coverage>
3636

‎.github/phpunit-postgres.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<directory suffix=".php">../sources/ext</directory>
3131
</exclude>
3232
<report>
33-
<clover outputFile="/tmp/pgdb.xml"/>
33+
<clover outputFile="/home/runner/work/Elkarte/Elkarte/elkarte/tmp/db.xml"/>
3434
</report>
3535
</coverage>
3636

‎.github/phpunit-webtest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<directory suffix=".php">../sources/ext</directory>
2727
</exclude>
2828
<report>
29-
<clover outputFile="/tmp/web.xml"/>
29+
<clover outputFile="/home/runner/work/Elkarte/Elkarte/elkarte/tmp/web.xml"/>
3030
</report>
3131
</coverage>
3232

‎.github/setup-failure.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -e
88
set +x
99

1010
# Agents will merge all coverage data...
11-
if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]
12-
then
13-
bash <(curl -s https://codecov.io/bash) -s "/tmp" -f '*.xml' -t "$CODECOV_TOKEN"
14-
fi
11+
#if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]
12+
#then
13+
# bash <(curl -s https://codecov.io/bash) -s "/tmp" -f '*.xml' -t "$CODECOV_TOKEN"
14+
#fi

‎.github/setup-results.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ CONFIG="--verbose --configuration .github/phpunit-$DB.xml"
1212
vendor/bin/phpunit ${CONFIG}
1313

1414
# Agents will merge all coverage data...
15-
if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]
16-
then
17-
bash <(curl -s https://codecov.io/bash) -s "/tmp" -f '*.xml' -t "$CODECOV_TOKEN"
18-
fi
15+
#if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]
16+
#then
17+
# bash <(curl -s https://codecov.io/bash) -s "/tmp" -f '*.xml' -t "$CODECOV_TOKEN"
18+
#fi

‎.github/workflows/tests.yaml

+26-11
Original file line numberDiff line numberDiff line change
@@ -75,24 +75,24 @@ jobs:
7575
DB: ${{ matrix.db }}
7676
PHP_VERSION: ${{ matrix.php }}
7777
WEBSERVER: 'nginx'
78-
run: .github/setup-elkarte.sh $DB $PHP_VERSION
78+
run: .github/setup-elkarte.sh
7979
working-directory: ./elkarte
8080

8181
- name: Run Unit Tests
8282
env:
8383
DB: ${{ matrix.db }}
8484
PHP_VERSION: ${{ matrix.php }}
85-
run: .github/setup-selenium.sh $DB $PHP_VERSION
85+
run: .github/setup-selenium.sh
8686
working-directory: ./elkarte
8787
continue-on-error: true
8888

89-
- name: Code Coverage
90-
env:
91-
DB: ${{ matrix.db }}
92-
PHP_VERSION: ${{ matrix.php }}
93-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
94-
run: .github/setup-failure.sh
95-
working-directory: ./elkarte
89+
- name: Send Coverage Reports
90+
if: ${{ github.event_name == 'pull_request' }}
91+
uses: codecov/codecov-action@v4
92+
with:
93+
files: /home/runner/work/Elkarte/Elkarte/elkarte/tmp/web.xml
94+
token: ${{ secrets.CODECOV_TOKEN }}
95+
verbose: false
9696

9797
- name: Server Error Log
9898
env:
@@ -138,7 +138,7 @@ jobs:
138138
env:
139139
DB: ${{ matrix.db }}
140140
PHP_VERSION: ${{ matrix.php }}
141-
run: .github/setup-elkarte.sh $DB $PHP_VERSION
141+
run: .github/setup-elkarte.sh
142142
working-directory: ./elkarte
143143

144144
- name: Install NodeJS
@@ -237,9 +237,16 @@ jobs:
237237
env:
238238
DB: ${{steps.database-type.outputs.db}}
239239
PHP_VERSION: ${{ matrix.php }}
240-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
241240
run: .github/setup-results.sh
242241
working-directory: ./elkarte
242+
243+
- name: Send Coverage Reports
244+
if: ${{ github.event_name == 'pull_request' }}
245+
uses: codecov/codecov-action@v4
246+
with:
247+
files: /home/runner/work/Elkarte/Elkarte/elkarte/tmp/db.xml
248+
token: ${{ secrets.CODECOV_TOKEN }}
249+
verbose: false
243250
# END MySQL and MariaDB Job
244251

245252
# START Postgres Tests
@@ -320,4 +327,12 @@ jobs:
320327
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
321328
run: .github/setup-results.sh
322329
working-directory: ./elkarte
330+
331+
- name: Send Coverage Reports
332+
if: ${{ github.event_name == 'pull_request' }}
333+
uses: codecov/codecov-action@v4
334+
with:
335+
files: /home/runner/work/Elkarte/Elkarte/elkarte/tmp/db.xml
336+
token: ${{ secrets.CODECOV_TOKEN }}
337+
verbose: false
323338
# END Postgres Job

0 commit comments

Comments
 (0)