From 939f6b0490d882b50c44650a17c9aba6388643cb Mon Sep 17 00:00:00 2001 From: Kenneth Geisshirt Date: Wed, 23 Aug 2017 15:05:24 +0200 Subject: [PATCH] Enabling Android building and testing --- Dockerfile | 1 + Jenkinsfile | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 Jenkinsfile diff --git a/Dockerfile b/Dockerfile index 05162f77..7851bbe4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,6 +55,7 @@ ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools RUN echo y | android update sdk --no-ui --all --filter tools > /dev/null && \ echo y | android update sdk --no-ui --all --filter platform-tools | grep 'package installed' && \ echo y | android update sdk --no-ui --all --filter build-tools-23.0.1 | grep 'package installed' && \ + echo y | android update sdk --no-ui --all --filter build-tools-25.0.2 | grep 'package installed' && \ echo y | android update sdk --no-ui --all --filter extra-android-m2repository | grep 'package installed' && \ echo y | android update sdk --no-ui --all --filter android-23 | grep 'package installed' diff --git a/Jenkinsfile b/Jenkinsfile old mode 100644 new mode 100755 index 85629f2d..26b0ce6d --- a/Jenkinsfile +++ b/Jenkinsfile @@ -72,9 +72,9 @@ stage('build') { macos_react_tests_release: doReactBuild('react-tests Release'), macos_react_example_debug: doMacBuild('react-example Debug'), macos_react_example_release: doMacBuild('react-example Release'), - //android_react_tests: doAndroidBuild('react-tests-android', { - // junit 'tests/react-test-app/tests.xml' - //}), + android_react_tests: doAndroidBuild('react-tests-android', { + junit 'tests/react-test-app/tests.xml' + }), windows_node: doWindowsBuild() ) }