From a58166a17584829017b848b63ff5480feaf1ba65 Mon Sep 17 00:00:00 2001 From: Arno Burkhart Date: Wed, 21 Feb 2024 20:25:02 +0100 Subject: [PATCH 1/2] #20: add flag keepScreenOn to timer layout --- app/src/main/res/layout/timer.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/timer.xml b/app/src/main/res/layout/timer.xml index 7c0aa19..75ed9b6 100644 --- a/app/src/main/res/layout/timer.xml +++ b/app/src/main/res/layout/timer.xml @@ -3,6 +3,7 @@ From 778695b167b9b22ffaef041a1e109cf1e6b8278f Mon Sep 17 00:00:00 2001 From: Arno Burkhart Date: Wed, 21 Feb 2024 20:26:12 +0100 Subject: [PATCH 2/2] Add push trigger for main branch in "Instrumented Tests" action --- .github/workflows/connected_check_on_pr.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/connected_check_on_pr.yml b/.github/workflows/connected_check_on_pr.yml index be33a9b..f955c6c 100644 --- a/.github/workflows/connected_check_on_pr.yml +++ b/.github/workflows/connected_check_on_pr.yml @@ -3,6 +3,10 @@ name: Instrumented Tests on: pull_request: types: [opened, reopened, synchronize] + push: + branches: + - 'main' + jobs: build: @@ -61,6 +65,7 @@ jobs: fi echo "TARGET=$TARGET" >> "$GITHUB_OUTPUT" +## Disable cache since it breaks the tests # - name: AVD cache # if: steps.check_pr.outputs.PERFORM_TEST != 0 # uses: actions/cache@v4 @@ -71,7 +76,7 @@ jobs: # ~/.android/adb* # key: avd-ubuntu-${{ matrix.api-level }} - - name: Perfom instrumented tests + - name: Perform instrumented tests # see https://github.com/marketplace/actions/android-emulator-runner uses: reactivecircus/android-emulator-runner@v2 with: api-level: ${{ matrix.api-level }}