Skip to content

Commit fbbd3e1

Browse files
authored
Merge branch 'master' into upgrade-spotless
2 parents bef16c3 + 1454460 commit fbbd3e1

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

Diff for: .github/workflows/ci.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
check-lint:
1313
name: Lint
14-
timeout-minutes: 5
14+
timeout-minutes: 10
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Fetch Sources
@@ -66,7 +66,9 @@ jobs:
6666
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
6767
- name: Run tests
6868
run: ./gradlew --no-daemon clean jacocoTestReport
69-
- name: Report test coverage
70-
run: |
71-
pip install --user codecov
72-
codecov
69+
- name: Upload code coverage
70+
uses: codecov/codecov-action@v4
71+
with:
72+
# Set to `true` once codecov token bug is fixed; https://github.com/parse-community/parse-server/issues/9129
73+
fail_ci_if_error: false
74+
token: ${{ secrets.CODECOV_TOKEN }}

Diff for: build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
ext.kotlin_version = "1.7.10"
3-
ext.jacocoVersion = '0.8.7'
3+
ext.jacocoVersion = '0.8.12'
44
ext.spotlessVersion = '6.25.0'
55
repositories {
66
google()

Diff for: parse/build.gradle

+7-6
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,22 @@ afterEvaluate {
7878
apply plugin: "com.dicedmelon.gradle.jacoco-android"
7979

8080
jacoco {
81-
toolVersion = "0.8.7"
81+
toolVersion = "0.8.12"
8282
}
8383

8484
tasks.withType(Test) {
8585
jacoco.includeNoLocationClasses = true
8686
jacoco.excludes = ['jdk.internal.*']
8787
testLogging {
88-
events "failed"
88+
events "SKIPPED", "FAILED"
89+
showStandardStreams true
90+
showExceptions true
91+
showCauses true
92+
showStackTraces true
93+
exceptionFormat "full"
8994
}
9095
}
9196

92-
tasks.withType(Test) {
93-
useJUnitPlatform()
94-
}
95-
9697
jacocoAndroidUnitTestReport {
9798
csv.enabled false
9899
html.enabled true

0 commit comments

Comments
 (0)