From a2b9c27b6cd97d79c3fcee5e41861e687c529037 Mon Sep 17 00:00:00 2001 From: Marc O'Morain Date: Tue, 2 May 2017 11:47:25 -0700 Subject: [PATCH 1/4] Local props --- circle.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..51c1b7f --- /dev/null +++ b/circle.yml @@ -0,0 +1,3 @@ +dependencies: + pre: + - touch local.properties From a090cc180b1aa0d507a484835c77334871c8b7c4 Mon Sep 17 00:00:00 2001 From: Marc O'Morain Date: Tue, 2 May 2017 15:33:25 -0700 Subject: [PATCH 2/4] Run emulator --- circle.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/circle.yml b/circle.yml index 51c1b7f..7e45e66 100644 --- a/circle.yml +++ b/circle.yml @@ -1,3 +1,18 @@ dependencies: pre: - touch local.properties + +machine: + environment: + QEMU_AUDIO_DRV: none + +test: + pre: + - emulator -avd circleci-android24 -no-window: + background: true + parallel: true + - circle-android wait-for-boot + override: + - ./gradlew assembleAndroidTest + - adb install sentry-android/build/outputs/apk/sentry-android-debug-androidTest.apk + - adb shell am instrument -w com.joshdholtz.sentry.test/android.test.InstrumentationTestRunner From 8e3be775558cc4d907915ed5cf405bad78544960 Mon Sep 17 00:00:00 2001 From: Marc O'Morain Date: Wed, 31 May 2017 11:18:28 +0100 Subject: [PATCH 3/4] Delay waiting for simulator --- circle.yml | 15 +++++++++------ licenses/android-googletv-license | 2 ++ licenses/android-sdk-license | 2 ++ licenses/android-sdk-preview-license | 2 ++ licenses/google-gdk-license | 2 ++ licenses/intel-android-extra-license | 2 ++ licenses/mips-android-sysimage-license | 2 ++ 7 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 licenses/android-googletv-license create mode 100644 licenses/android-sdk-license create mode 100644 licenses/android-sdk-preview-license create mode 100644 licenses/google-gdk-license create mode 100644 licenses/intel-android-extra-license create mode 100644 licenses/mips-android-sysimage-license diff --git a/circle.yml b/circle.yml index 7e45e66..14490bd 100644 --- a/circle.yml +++ b/circle.yml @@ -1,18 +1,21 @@ -dependencies: - pre: - - touch local.properties - machine: environment: QEMU_AUDIO_DRV: none + TERM: dumb -test: +dependencies: pre: + - touch local.properties + - cp -rv licenses $ANDROID_HOME + - echo y | android update sdk --no-ui --all --filter build-tools-25.0.3 - emulator -avd circleci-android24 -no-window: background: true parallel: true - - circle-android wait-for-boot override: - ./gradlew assembleAndroidTest + +test: + override: + - circle-android wait-for-boot - adb install sentry-android/build/outputs/apk/sentry-android-debug-androidTest.apk - adb shell am instrument -w com.joshdholtz.sentry.test/android.test.InstrumentationTestRunner diff --git a/licenses/android-googletv-license b/licenses/android-googletv-license new file mode 100644 index 0000000..07d43f0 --- /dev/null +++ b/licenses/android-googletv-license @@ -0,0 +1,2 @@ + +601085b94cd77f0b54ff86406957099ebe79c4d6 \ No newline at end of file diff --git a/licenses/android-sdk-license b/licenses/android-sdk-license new file mode 100644 index 0000000..0bf3284 --- /dev/null +++ b/licenses/android-sdk-license @@ -0,0 +1,2 @@ + +8933bad161af4178b1185d1a37fbf41ea5269c55 \ No newline at end of file diff --git a/licenses/android-sdk-preview-license b/licenses/android-sdk-preview-license new file mode 100644 index 0000000..da4552d --- /dev/null +++ b/licenses/android-sdk-preview-license @@ -0,0 +1,2 @@ + +84831b9409646a918e30573bab4c9c91346d8abd \ No newline at end of file diff --git a/licenses/google-gdk-license b/licenses/google-gdk-license new file mode 100644 index 0000000..db3b42f --- /dev/null +++ b/licenses/google-gdk-license @@ -0,0 +1,2 @@ + +33b6a2b64607f11b759f320ef9dff4ae5c47d97a \ No newline at end of file diff --git a/licenses/intel-android-extra-license b/licenses/intel-android-extra-license new file mode 100644 index 0000000..f82e65b --- /dev/null +++ b/licenses/intel-android-extra-license @@ -0,0 +1,2 @@ + +d975f751698a77b662f1254ddbeed3901e976f5a \ No newline at end of file diff --git a/licenses/mips-android-sysimage-license b/licenses/mips-android-sysimage-license new file mode 100644 index 0000000..8f4f164 --- /dev/null +++ b/licenses/mips-android-sysimage-license @@ -0,0 +1,2 @@ + +e9acab5b5fbb560a72cfaecce8946896ff6aab9d \ No newline at end of file From f1d59436268691fd91810178f0ebd000b12715af Mon Sep 17 00:00:00 2001 From: Marc O'Morain Date: Tue, 6 Jun 2017 17:19:26 +0100 Subject: [PATCH 4/4] hunt --- circle.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/circle.yml b/circle.yml index 14490bd..e6d4d00 100644 --- a/circle.yml +++ b/circle.yml @@ -6,16 +6,18 @@ machine: dependencies: pre: - touch local.properties - - cp -rv licenses $ANDROID_HOME - - echo y | android update sdk --no-ui --all --filter build-tools-25.0.3 - - emulator -avd circleci-android24 -no-window: - background: true - parallel: true - override: - - ./gradlew assembleAndroidTest + # Android SDK Platform 25 + - if [ ! -d "/usr/local/android-sdk-linux/platforms/android-25" ]; then echo y | android update sdk --no-ui --all --filter "android-25"; fi + # Android SDK Build-tools, revision 25.0.0 + - if [ ! -d "/usr/local/android-sdk-linux/build-tools/25.0.0" ]; then echo y | android update sdk --no-ui --all --filter "build-tools-25.0.0"; fi + - echo "y" | android update sdk --no-ui --all --filter tools,platform-tools,extra-google-m2repository,extra-google-google_play_services,extra-android-support,extra-android-m2repository + + cache_directories: + - /usr/local/android-sdk-linux/licenses + - /usr/local/android-sdk-linux/platforms/android-25 + - /usr/local/android-sdk-linux/build-tools/25.0.0 + - /usr/local/android-sdk-linux/extras/android/m2repository test: override: - - circle-android wait-for-boot - - adb install sentry-android/build/outputs/apk/sentry-android-debug-androidTest.apk - - adb shell am instrument -w com.joshdholtz.sentry.test/android.test.InstrumentationTestRunner + - ./gradlew assembleDebug