Browse Source

Add script to run journey test into it's own file in order to make it less complicated

Logan Stucki 9 years ago
parent
commit
e5d6d3760a
No account linked to committer's email
2 changed files with 23 additions and 17 deletions
  1. 2
    17
      .travis.yml
  2. 21
    0
      bin/run-journey-test-from-ci.sh

+ 2
- 17
.travis.yml View File

@@ -5,22 +5,7 @@ jdk:
5 5
 env:
6 6
   - SCRIPT=bin/unit-tests.sh
7 7
 
8
-  - SCRIPT="bin/build-jq.sh;
9
-      modded_files=\`curl -s https://api.github.com/repos/exercism/java/pulls/${TRAVIS_PULL_REQUEST}/files | bin/jq -r '.[].filename'\`;
10
-      for file in \$modded_files;
11
-        do if [[ \$file == exercises* ]] || [[ \$file == config.json ]];
12
-          then rvm install 2.2.5;
13
-          rvm use 2.2.5;
14
-          for file2 in \$modded_files;
15
-            do if [[ \$file2 == exercises* ]];
16
-              then modded_exercise=\${file2#exercises/};
17
-              modded_exercise=\${modded_exercise%%/*};
18
-            fi;
19
-          done;
20
-          bin/journey-test.sh \$modded_exercise;
21
-          break;
22
-        fi;
23
-      done"
8
+  - SCRIPT=bin/run-journey-test-from-ci.sh
24 9
 
25 10
 # http://docs.travis-ci.com/user/migrating-from-legacy
26 11
 sudo: false
@@ -37,7 +22,7 @@ before_script:
37 22
   - export PATH=$TRAVIS_BUILD_DIR/bin:$PATH  # ensure our tools are prefered over included ones.
38 23
 
39 24
 script:
40
-  - eval $SCRIPT
25
+  - $SCRIPT
41 26
 
42 27
 # configure caching (https://docs.travis-ci.com/user/languages/java/#Caching)
43 28
 before_cache:

+ 21
- 0
bin/run-journey-test-from-ci.sh View File

@@ -0,0 +1,21 @@
1
+#!/bin/bash
2
+
3
+bin/build-jq.sh
4
+
5
+pr_files_json=`curl -s https://api.github.com/repos/exercism/java/pulls/${TRAVIS_PULL_REQUEST}/files`
6
+modded_files=`echo $pr_files_json | bin/jq -r '.[].filename'`
7
+
8
+for file in $modded_files
9
+  do if [[ $file == exercises* ]] || [[ $file == config.json ]]
10
+    then rvm install 2.2.5
11
+    rvm use 2.2.5
12
+    for file2 in $modded_files
13
+      do if [[ $file2 == exercises* ]]
14
+        then modded_exercise=${file2#exercises/}
15
+        modded_exercise=${modded_exercise%%/*}
16
+      fi
17
+    done
18
+    bin/journey-test.sh $modded_exercise
19
+    break
20
+  fi
21
+done