Skip to content

Commit 41fed58

Browse files
authored
Merge branch 'master' into deps/firebase-bom-33.16.0
2 parents 6531b1c + 50eb54f commit 41fed58

377 files changed

Lines changed: 22883 additions & 5337 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/pull_request_template.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ In particular consider how existing data may be impacted by this change.
2424
### Automated test coverage
2525
<!-- Identify the related test coverage and the conditions it will catch -->
2626

27-
### QA Plan
28-
<!--
29-
- Describe QA plan that (along with test coverage) proves that this PR is regression free.
30-
- Link to QA Ticket
31-
-->
32-
3327
## Labels and Review
3428

3529
- [ ] Do we need to enhance the manual QA test coverage ? If yes, [RELEASES.md](../RELEASES.md) is updated accordingly

.github/workflows/commcare-android-pr-workflow.yml

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ jobs:
2323
build-test-assemble:
2424
name: Build
2525
runs-on: ubuntu-latest
26+
permissions:
27+
contents: read
28+
pull-requests: write
29+
id-token: write
2630
steps:
2731
- name: Checkout commcare-android
2832
uses: actions/checkout@v6
@@ -89,6 +93,24 @@ jobs:
8993
- name: Run Tests
9094
run: ./gradlew testCommcareDebug
9195
working-directory: commcare-android
96+
- name: Generate JaCoCo Report
97+
continue-on-error: true
98+
run: ./gradlew jacocoTestReport
99+
working-directory: commcare-android
100+
- name: Upload JaCoCo Report
101+
continue-on-error: true
102+
uses: actions/upload-artifact@v6
103+
with:
104+
name: jacoco-report
105+
path: commcare-android/app/build/reports/jacoco
106+
- name: Upload coverage to Codecov
107+
if: ${{ github.event_name == 'pull_request' }}
108+
continue-on-error: true
109+
uses: codecov/codecov-action@v5
110+
with:
111+
files: commcare-android/app/build/reports/jacoco/jacocoTestReport/jacocoTestReport.xml
112+
use_oidc: true
113+
fail_ci_if_error: false
92114
- name: Restore Keystore
93115
run: echo "$SIGNING_KEY" | base64 -d > ~/.gradle/commcare-odk-keys.keystore
94116
env:
@@ -155,14 +177,6 @@ jobs:
155177
with:
156178
name: commcare-release-androidTest-apk
157179
path: commcare-android/app/build/outputs/apk/androidTest/commcare/release/app-commcare-release-androidTest.apk.enc
158-
- name: Generate JaCoCo Report
159-
run: ./gradlew JacocoTestReport
160-
working-directory: commcare-android
161-
- name: Upload JaCoCo Report
162-
uses: actions/upload-artifact@v6
163-
with:
164-
name: jacoco-report
165-
path: commcare-android/app/build/reports
166180
- name: Report status to commcare-core
167181
if: ${{ always() && inputs.commcare_core_check_name && inputs.commcare_core_sha }}
168182
uses: actions/github-script@v7
@@ -224,5 +238,5 @@ jobs:
224238
BROWSERSTACK_PASSWORD: ${{ secrets.BROWSERSTACK_PASSWORD }}
225239
RELEASE_APP_LOCATION: commcare-release-apk/app-commcare-release.apk
226240
TEST_APP_LOCATION: commcare-release-androidTest-apk/app-commcare-release-androidTest.apk
227-
BROWSERSTACK_DEVICES: "Samsung Galaxy S10-9.0"
241+
BROWSERSTACK_DEVICES: "Samsung Galaxy S20-10.0"
228242
PR_NUMBER: ${{ github.event.number }}

.github/workflows/pr-comment-handler.lock.yml

Lines changed: 11 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)