diff --git a/.github/workflows/android_test.yml b/.github/workflows/android_test.yml index d681e2d3ed..34ec36d204 100644 --- a/.github/workflows/android_test.yml +++ b/.github/workflows/android_test.yml @@ -2,9 +2,9 @@ name: Android Test CI on: push: - branches: [ feature/git-actions ] + branches: [ development, master ] pull_request: - branches: [ feature/git-actions ] + branches: [ development, master ] jobs: build: diff --git a/.github/workflows/espresso_CI.yml b/.github/workflows/espresso_CI.yml deleted file mode 100644 index e7a9dc54e1..0000000000 --- a/.github/workflows/espresso_CI.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Android CI -on: - pull_request: - branches: development - -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - - name: set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - # Execute unit tests - - name: Unit Test - run: ./gradlew testDebugUnitTest - - - name: to run espresso tests - uses: reactivecircus/android-emulator-runner@v2.6.1 - with: - api-level: 23 - target: default - arch: x86 - profile: Nexus 6 - script: ./gradlew connectedCheckdevDebug --stacktrace