Merge pull request exercism#688 from Smarticles101/build-matrix

FridaTveit · web-flow · commit 5f7886a7dd87 · 2017-07-10T13:49:50.000+01:00
Optimize CI Tests
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,9 @@
 language: java
 jdk:
   - oraclejdk8
+env:
+  - SCRIPT=bin/unit-tests.sh
+  - SCRIPT=bin/journey-test.sh
 
 # http://docs.travis-ci.com/user/migrating-from-legacy
 sudo: false
@@ -23,8 +26,7 @@ before_script:
   - export PATH=$TRAVIS_BUILD_DIR/bin:$PATH  # ensure our tools are prefered over included ones.
 
 script:
-  - bin/unit-tests.sh
-  - bin/journey-test.sh
+  - $SCRIPT
 
 # configure caching (https://docs.travis-ci.com/user/languages/java/#Caching)
 before_cache:
diff --git a/bin/journey-test.sh b/bin/journey-test.sh
@@ -3,6 +3,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`
 
 on_exit() {
   echo ">>> on_exit()"
@@ -96,6 +97,14 @@ get_cpu_architecture() {
   esac
 }
 
+get_optimal_amount_of_jobs() {
+  if [ "$CPU_CORES" -gt "1" ]; then 
+    echo $((CPU_CORES-1))
+  else 
+    echo 1 
+  fi
+}
+
 download_exercism_cli() {
   local os="$1"
   local arch="$2"
@@ -162,7 +171,7 @@ make_local_trackler() {
   cp -r ${track_root}/exercises tracks/${TRACK}
 
   gem install bundler
-  bundle install
+  bundle install --jobs $(get_optimal_amount_of_jobs)
   gem build trackler.gemspec
 
   # Make *this* the gem that x-api uses when we build x-api.
@@ -179,7 +188,7 @@ start_x_api() {
   pushd $xapi_home
 
   gem install bundler
-  bundle install
+  bundle install --jobs $(get_optimal_amount_of_jobs) 
   RACK_ENV=development rackup &
   xapi_pid=$!
   sleep 5
@@ -267,18 +276,24 @@ main() {
 
   clean "${build_dir}"
 
-  # Make a local version of trackler that includes the source from this repo.
-  git_clone "x-api" "${xapi_home}"
-  git_clone "trackler" "${trackler_home}"
-  assert_ruby_installed "${trackler_home}"
+  # Download everything we need in parallel
+  git_clone "x-api" "${xapi_home}" &
+  git_clone "trackler" "${trackler_home}" &
+  download_exercism_cli $(get_operating_system) $(get_cpu_architecture) "${exercism_home}" &
+  wait
+
+  # Check and install the ruby stuff we need in parallel
+  assert_ruby_installed "${trackler_home}" &
+  assert_ruby_installed "${xapi_home}" &
+  wait
+
+  # Make a local version of trackler
   make_local_trackler "${trackler_home}" "${xapi_home}"
 
-  # Stand-up a local instance of x-api so we can fetch the exercises through it.
-  assert_ruby_installed "${xapi_home}"
+  # Start-up a local instance of x-api so we can fetch the exercises through it.
   start_x_api "${xapi_home}"
 
   # Create a CLI install and config just for this build; this script does not use your CLI install.
-  download_exercism_cli $(get_operating_system) $(get_cpu_architecture) "${exercism_home}"
   configure_exercism_cli "${exercism_home}" "${exercism_configfile}" "${xapi_port}"
 
   solve_all_exercises "${exercism_home}" "${exercism_configfile}"
diff --git a/bin/unit-tests.sh b/bin/unit-tests.sh
@@ -12,4 +12,3 @@ echo ""
 echo ">>> Running tests..."
 TERM=dumb ../gradlew check compileStarterSourceJava --parallel --continue
 popd
-
