From c9ed908424fb6070f6bbc5414c153c7e84e69290 Mon Sep 17 00:00:00 2001 From: blue928sky Date: Sat, 18 Jan 2025 14:46:43 +0900 Subject: [PATCH 1/7] fix: Coverage report is not displayed Change-Id: I0fcb548c30c0cd8fce47fe70e086d43e90813e8d --- .github/workflows/Build.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index 5a212bffb7..f7a1032494 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -201,14 +201,14 @@ jobs: heap-size: 600M script: ./gradlew connectedDemoDebugAndroidTest --daemon - - name: Run local tests (including Roborazzi) for the combined coverage report (only API 30) - if: matrix.api-level == 30 + - name: Run local tests (including Roborazzi) for the combined coverage report (only API 34) + if: matrix.api-level == 34 # There is no need to verify Roborazzi tests to generate coverage. run: ./gradlew testDemoDebugUnitTest -Proborazzi.test.verify=false # Add Prod if we ever add JVM tests for prod # Add `createProdDebugUnitTestCoverageReport` if we ever add JVM tests for prod - - name: Generate coverage reports for Debug variants (only API 30) - if: matrix.api-level == 30 + - name: Generate coverage reports for Debug variants (only API 34) + if: matrix.api-level == 34 run: ./gradlew createDemoDebugCombinedCoverageReport - name: Upload test reports @@ -218,8 +218,8 @@ jobs: name: test-reports-${{ matrix.api-level }} path: '**/build/reports/androidTests' - - name: Display local test coverage (only API 30) - if: matrix.api-level == 30 + - name: Display local test coverage (only API 34) + if: matrix.api-level == 34 id: jacoco uses: madrapps/jacoco-report@v1.7.1 with: @@ -230,8 +230,8 @@ jobs: ${{ github.workspace }}/**/build/reports/jacoco/**/*Report.xml token: ${{ secrets.GITHUB_TOKEN }} - - name: Upload local coverage reports (XML + HTML) (only API 30) - if: matrix.api-level == 30 + - name: Upload local coverage reports (XML + HTML) (only API 34) + if: matrix.api-level == 34 uses: actions/upload-artifact@v4 with: name: coverage-reports From 5e0b578dcbeb45b4c943ba28d3af9e85725c7d97 Mon Sep 17 00:00:00 2001 From: blue928sky Date: Sat, 18 Jan 2025 22:18:41 +0900 Subject: [PATCH 2/7] Empty commit to trigger build workflow Change-Id: Ie5f686baa54cfaeea96a76c366a6ce464a9659db From 95e8b1a174251208ffe274886b22167dac47d596 Mon Sep 17 00:00:00 2001 From: blue928sky Date: Tue, 21 Jan 2025 20:09:02 +0900 Subject: [PATCH 3/7] Change ubuntu version, because androidTest(34) workflow fails Change-Id: I09ed78d4aee0492497a71bd697a23843537a7ca7 --- .github/workflows/Build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index f7a1032494..39e44154fb 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -13,7 +13,7 @@ concurrency: jobs: test_and_apk: name: "Local tests and APKs" - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 permissions: contents: write From 847d63cb87ad6fc4a6727f0d68c86637d4e0d276 Mon Sep 17 00:00:00 2001 From: blue928sky Date: Sat, 25 Jan 2025 17:24:55 +0900 Subject: [PATCH 4/7] Empty commit to trigger build workflow Change-Id: Iece2fd3f9a589e7d87eff6367b2bc7e65898d366 From e653f7501efe31250b2878e4e3b6e92c98217451 Mon Sep 17 00:00:00 2001 From: blue928sky Date: Sun, 2 Feb 2025 15:37:10 +0900 Subject: [PATCH 5/7] Revert "Change ubuntu version, because androidTest(34) workflow fails" This reverts commit 95e8b1a174251208ffe274886b22167dac47d596. --- .github/workflows/Build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index 39e44154fb..f7a1032494 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -13,7 +13,7 @@ concurrency: jobs: test_and_apk: name: "Local tests and APKs" - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest permissions: contents: write From 46553e1302492508a66f595cfb1a23fcfca7baed Mon Sep 17 00:00:00 2001 From: blue928sky Date: Sun, 2 Feb 2025 15:31:43 +0900 Subject: [PATCH 6/7] Fix an hang on problem. https://github.com/ReactiveCircus/android-emulator-runner/issues/385#issuecomment-2492035091 Change-Id: Id0dc3b07e9836cb4f3704450e2eb520412ba73b9 --- .github/workflows/Build.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index f7a1032494..3944aae17b 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -199,7 +199,10 @@ jobs: disable-animations: true disk-size: 6000M heap-size: 600M - script: ./gradlew connectedDemoDebugAndroidTest --daemon + # && killall -INT crashpad_handler || true + # came from https://github.com/ReactiveCircus/android-emulator-runner/issues/385#issuecomment-2492035091 + script: | + ./gradlew connectedDemoDebugAndroidTest --daemon && killall -INT crashpad_handler || true - name: Run local tests (including Roborazzi) for the combined coverage report (only API 34) if: matrix.api-level == 34 From 704e79ba7b6ca1d2169f0b294dcdd9c171cc92e4 Mon Sep 17 00:00:00 2001 From: blue928sky Date: Sun, 2 Feb 2025 15:32:26 +0900 Subject: [PATCH 7/7] Fix format Change-Id: Id326aae86bfe9345b1207110bf4e648983c0dd91 --- .github/workflows/Build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index 3944aae17b..c243e11388 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -153,7 +153,7 @@ jobs: timeout-minutes: 55 strategy: matrix: - api-level: [26, 34] + api-level: [ 26, 34 ] steps: - name: Delete unnecessary tools 🔧 @@ -213,7 +213,7 @@ jobs: - name: Generate coverage reports for Debug variants (only API 34) if: matrix.api-level == 34 run: ./gradlew createDemoDebugCombinedCoverageReport - + - name: Upload test reports if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 @@ -232,7 +232,7 @@ jobs: paths: | ${{ github.workspace }}/**/build/reports/jacoco/**/*Report.xml token: ${{ secrets.GITHUB_TOKEN }} - + - name: Upload local coverage reports (XML + HTML) (only API 34) if: matrix.api-level == 34 uses: actions/upload-artifact@v4