Skip to content

Commit 5c4a4ac

Browse files
committed
android: run integration test in CI
Fixes tailscale/corp#24242 Signed-off-by: kari-ts <[email protected]>
1 parent 4c4148b commit 5c4a4ac

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

.github/workflows/android.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,17 @@ jobs:
3333
- name: Build APKs
3434
run: make tailscale-debug.apk
3535

36-
- name: Run tests
37-
run: make test
36+
- name: Run Unit Tests
37+
run: ./gradlew test
38+
39+
- name: Set up Android SDK
40+
uses: android-actions/setup-android@v3
41+
42+
- name: Start emulator
43+
run: |
44+
adb devices
45+
adb wait-for-device
46+
adb shell input keyevent 82 &
47+
48+
- name: Run Integration Tests
49+
run: ./gradlew connectedAndroidTest

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,10 @@ checkandroidsdk: ## Check that Android SDK is installed
247247
test: gradle-dependencies ## Run the Android tests
248248
(cd android && ./gradlew test)
249249

250+
.PHONY: integration-test
251+
integration-test: gradle-dependencies ## Run the integration tests
252+
(cd android && ./gradlew connectedAndroidTest)
253+
250254
.PHONY: emulator
251255
emulator: ## Start an android emulator instance
252256
@echo "Checking installed SDK packages..."

0 commit comments

Comments
 (0)