From 20a0ec699a62a64ae0550898d0602ad0c1c1a3e6 Mon Sep 17 00:00:00 2001 From: Esref Ozdemir Date: Fri, 27 Oct 2017 18:30:37 +0300 Subject: [PATCH 1/2] Test running only parts of travis tests. --- .travis.yml | 10 ++++++++++ any_changes_in.sh | 8 ++++++++ 2 files changed, 18 insertions(+) create mode 100644 any_changes_in.sh diff --git a/.travis.yml b/.travis.yml index 1b2ed6f0..a25e163e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,10 @@ matrix: env: - DJANGO=1.4.1 + before_install: + - git fetch https://github.com/bounswe/bounswe2017group10.git master:master + - bash ./any_changes_in.sh backend || travis_terminate 0 + install: - cd Atlas/backend - virtualenv atlasenv @@ -25,6 +29,9 @@ matrix: # FRONTEND - language: python python: 3.6 + before_install: + - git fetch https://github.com/bounswe/bounswe2017group10.git master:master + - bash ./any_changes_in.sh frontend || travis_terminate 0 before_script: - cd Atlas/frontend - chmod +x test @@ -52,6 +59,9 @@ matrix: - extra-google-m2repository - extra-android-m2repository - sys-img-armeabi-v7a-android-17 + before_install: + - git fetch https://github.com/bounswe/bounswe2017group10.git master:master + - bash ./any_changes_in.sh android || travis_terminate 0 install: # Update sdk tools to latest version and install/update components - echo yes | sdkmanager "tools" diff --git a/any_changes_in.sh b/any_changes_in.sh new file mode 100644 index 00000000..7a9ec847 --- /dev/null +++ b/any_changes_in.sh @@ -0,0 +1,8 @@ +#!/bin/bash + + +project=$1 +num_changed_files=`git diff --name-only master | grep -E "^Atlas/${project}" | wc -l` + +[[ ${num_changed_files} -ne 0 ]] +exit $? From a37bd66198aaa0a3515919b773e3fa8eb68d10de Mon Sep 17 00:00:00 2001 From: Esref Ozdemir Date: Fri, 27 Oct 2017 19:43:06 +0300 Subject: [PATCH 2/2] Move android component installing to install part to reduce time. --- .travis.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index a25e163e..65b2db0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,18 +52,17 @@ matrix: - $HOME/.gradle/native/ - $HOME/.gradle/daemon/ android: - components: - - android-26 - - android-17 - - build-tools-26.0.1 - - extra-google-m2repository - - extra-android-m2repository - - sys-img-armeabi-v7a-android-17 before_install: - git fetch https://github.com/bounswe/bounswe2017group10.git master:master - bash ./any_changes_in.sh android || travis_terminate 0 install: # Update sdk tools to latest version and install/update components + - android-update-sdk --components=android-26 + - android-update-sdk --components=android-17 + - android-update-sdk --components=build-tools-26.0.1 + - android-update-sdk --components=extra-google-m2repository + - android-update-sdk --components=extra-android-m2repository + - android-update-sdk --components=sys-img-armeabi-v7a-android-17 - echo yes | sdkmanager "tools" - echo yes | sdkmanager "platforms;android-26" - echo yes | sdkmanager "extras;android;m2repository" @@ -88,6 +87,4 @@ notifications: email: - yigitozkavci8@gmail.com - ramazankaniturkmen@gmail.com - - s.talhanisanci@gmail.com - aykut___1995@hotmail.com - - esref.ozdemir27@gmail.com