Merge pull request #734 from Smarticles101/speed-up-travis-build

Implement suggestions from #410

.travis.yml

@@ -4,7 +4,8 @@ jdk:
   - oraclejdk8
 env:
   - SCRIPT=bin/unit-tests.sh
-  - SCRIPT=bin/journey-test.sh
+
+  - SCRIPT=bin/run-journey-test-from-ci.sh
 
 # http://docs.travis-ci.com/user/migrating-from-legacy
 sudo: false
@@ -17,7 +18,6 @@ addons:
 before_install:
   - rvm install 2.2.5
   - rvm use 2.2.5
-  - bin/build-jq.sh  # we want jq 1.5 features; not avail through pkg repo.
 
 # https://docs.travis-ci.com/user/customizing-the-build#Skipping-the-Installation-Step
 install: true  # if we don't skip install, ./gradlew assemble is invoked, but this task is not available.

bin/journey-test.sh

@@ -4,6 +4,7 @@ TRACK=java
 TRACK_REPO="$TRACK"
 TRACK_SRC_EXT="java"
 CPU_CORES=`getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1`
+EXERCISES_TO_SOLVE=$@
 
 on_exit() {
   echo ">>> on_exit()"
@@ -256,6 +257,42 @@ solve_all_exercises() {
   popd
 }
 
+solve_single_exercise() {
+  local exercism_exercises_dir="$1"
+  local exercism_configfile="$2"
+  local exercise_to_solve="$3"
+  echo ">>> solve_all_exercises(exercism_exercises_dir=\"${exercism_exercises_dir}\", exercism_configfile=\"${exercism_configfile}\", exercise_to_solve=\"$exercise_to_solve\")"
+
+  local track_root=$( pwd )
+  local exercism_cli="./exercism --config ${exercism_configfile}"
+  local tempfile="${TMPDIR:-/tmp}/journey-test.sh-unignore_all_tests.txt"
+
+  pushd ${exercism_exercises_dir}
+
+  echo -e "\n\n"
+  echo "=================================================="
+  echo "Solving ${exercise_to_solve}"
+  echo "=================================================="
+
+  ${exercism_cli} fetch ${TRACK} $exercise_to_solve
+  cp -R -H ${track_root}/exercises/${exercise_to_solve}/src/example/${TRACK}/* ${exercism_exercises_dir}/${TRACK}/${exercise_to_solve}/src/main/${TRACK}/
+
+  pushd ${exercism_exercises_dir}/${TRACK}/${exercise_to_solve}
+  # Check that tests compile before we strip @Ignore annotations
+  "$EXECPATH"/gradlew compileTestJava
+  # Ensure we run all the tests (as delivered, all but the first is @Ignore'd)
+  for testfile in `find . -name "*Test.${TRACK_SRC_EXT}"`; do
+    # Strip @Ignore annotations to ensure we run the tests (as delivered, all but the first is @Ignore'd).
+    # Note that unit-test.sh also strips @Ignore annotations via the Gradle task copyTestsFilteringIgnores.
+    # The stripping implementations here and in copyTestsFilteringIgnores should be kept consistent.
+    sed 's/@Ignore\(\(.*\)\)\{0,1\}//' ${testfile} > "${tempfile}" && mv "${tempfile}" "${testfile}"
+  done
+  "$EXECPATH"/gradlew test
+  popd
+
+  popd
+}
+
 main() {
   # all functions assume current working directory is repository root.
   cd "${SCRIPTPATH}/.."
@@ -296,7 +333,13 @@ main() {
   # Create a CLI install and config just for this build; this script does not use your CLI install.
   configure_exercism_cli "${exercism_home}" "${exercism_configfile}" "${xapi_port}"
 
-  solve_all_exercises "${exercism_home}" "${exercism_configfile}"
+  if [[ $EXERCISES_TO_SOLVE == "" ]]; then
+    solve_all_exercises "${exercism_home}" "${exercism_configfile}"
+  else
+    for exercise in $EXERCISES_TO_SOLVE
+      do solve_single_exercise "${exercism_home}" "${exercism_configfile}" "${exercise}"
+    done
+  fi
 }
 
 ##########################################################################

bin/run-journey-test-from-ci.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+bin/build-jq.sh
+
+pr_files_json=`curl -s https://api.github.com/repos/exercism/java/pulls/${TRAVIS_PULL_REQUEST}/files`
+
+# if jq fails to get the required data, then that means TRAVIS_PULL_REQUEST was not set (not run in travis-ci),
+# or was false (not a pull request). In that case, we should fall back with testing every exercise
+
+modded_files=`echo $pr_files_json | bin/jq -r '.[].filename'` || bin/journey-test.sh
+
+for file in $modded_files
+  do if [[ $file == exercises* ]] || [[ $file == config.json ]]
+    then
+    for file2 in $modded_files
+      do if [[ $file2 == exercises* ]]
+        then modded_exercise=${file2#exercises/}
+        modded_exercise=${modded_exercise%%/*}
+        if [[ $last_modded_exercise != $modded_exercise ]]
+          then modded_exercises=$modded_exercises$modded_exercise$'\n'
+        fi
+        last_modded_exercise=$modded_exercise
+      fi
+    done
+    bin/journey-test.sh $modded_exercises
+    break
+  fi
+done