Skip to content

Commit 3b00420

Browse files
Fix syntax error in Android PR workflow and simplify coverage logic.
- Removed malformed shell script block in `scripts-android.yml` that caused syntax errors in the emulator runner. - Moved logic to skip coverage report generation into `run-android-instrumentation-tests.sh` using the `CN1SS_SKIP_COVERAGE` env var. - Updated workflow to set `CN1SS_SKIP_COVERAGE=1` for non-default matrix jobs. - Simplified `android-emulator-runner` script input to a single line command.
1 parent 583caeb commit 3b00420

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

.github/workflows/scripts-android.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ jobs:
109109
run: |
110110
echo "CN1SS_SKIP_COMMENT=1" >> $GITHUB_ENV
111111
echo "CN1SS_FAIL_ON_MISMATCH=1" >> $GITHUB_ENV
112+
echo "CN1SS_SKIP_COVERAGE=1" >> $GITHUB_ENV
112113
- name: Setup workspace
113114
run: ./scripts/setup-workspace.sh -q -DskipTests
114115
- name: Build Android port
@@ -127,11 +128,7 @@ jobs:
127128
api-level: 31
128129
arch: x86_64
129130
target: google_apis
130-
script: |
131-
./scripts/run-android-instrumentation-tests.sh "${{ steps.build-android-app.outputs.gradle_project_dir }}"
132-
if [ "${{ matrix.id }}" == "default" ]; then
133-
./scripts/generate-android-coverage-report.sh "${{ steps.build-android-app.outputs.gradle_project_dir }}"
134-
fi
131+
script: ./scripts/run-android-instrumentation-tests.sh "${{ steps.build-android-app.outputs.gradle_project_dir }}"
135132
- name: Upload emulator screenshot
136133
if: always() && matrix.id == 'default'
137134
uses: actions/upload-artifact@v4

scripts/run-android-instrumentation-tests.sh

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,19 @@ done
142142

143143
sleep 3
144144

145-
ra_log "STAGE:COVERAGE -> Collecting Jacoco coverage report"
146-
if ARTIFACTS_DIR="$ARTIFACTS_DIR" "$SCRIPT_DIR/generate-android-coverage-report.sh" "$GRADLE_PROJECT_DIR"; then
147-
if [ -f "$COVERAGE_SUMMARY" ]; then
148-
ra_log " -> Coverage summary detected at $COVERAGE_SUMMARY"
145+
if [ "${CN1SS_SKIP_COVERAGE:-0}" = "1" ]; then
146+
ra_log "Skipping coverage report generation (CN1SS_SKIP_COVERAGE=1)"
147+
else
148+
ra_log "STAGE:COVERAGE -> Collecting Jacoco coverage report"
149+
if ARTIFACTS_DIR="$ARTIFACTS_DIR" "$SCRIPT_DIR/generate-android-coverage-report.sh" "$GRADLE_PROJECT_DIR"; then
150+
if [ -f "$COVERAGE_SUMMARY" ]; then
151+
ra_log " -> Coverage summary detected at $COVERAGE_SUMMARY"
152+
else
153+
ra_log " -> Coverage summary not found after report generation"
154+
fi
149155
else
150-
ra_log " -> Coverage summary not found after report generation"
156+
ra_log "WARNING: Coverage report generation failed; continuing without coverage details"
151157
fi
152-
else
153-
ra_log "WARNING: Coverage report generation failed; continuing without coverage details"
154158
fi
155159

156160
declare -a CN1SS_SOURCES=("LOGCAT:$TEST_LOG")

0 commit comments

Comments
 (0)