Sfoglia il codice sorgente

Ensure journey test versions trackler as X-API expects.

John S. Ryan 9 anni fa
parent
commit
68684542b4
1 ha cambiato i file con 9 aggiunte e 4 eliminazioni
  1. 9
    4
      bin/journey-test.sh

+ 9
- 4
bin/journey-test.sh Vedi File

121
 
121
 
122
 make_local_trackler() {
122
 make_local_trackler() {
123
   local trackler="$1"
123
   local trackler="$1"
124
-  echo ">>> make_local_trackler(trackler=\"${trackler}\")"
124
+  local xapi_home="$2"
125
+  echo ">>> make_local_trackler(trackler=\"${trackler}\", xapi_home=\"${xapi_home}\")"
125
 
126
 
126
   local xjava=$( pwd )
127
   local xjava=$( pwd )
127
   pushd ${trackler}
128
   pushd ${trackler}
134
   cp ${xjava}/config.json tracks/java
135
   cp ${xjava}/config.json tracks/java
135
   cp -r ${xjava}/exercises tracks/java
136
   cp -r ${xjava}/exercises tracks/java
136
 
137
 
138
+  # Set the version to that expected by x-api
139
+  version=$( grep -m 1 'trackler' ${xapi_home}/Gemfile.lock | sed 's/.*(//' | sed 's/)//' )
140
+  echo "module Trackler VERSION = \"${version}\" end" > lib/trackler/version.rb
141
+
137
   gem install bundler
142
   gem install bundler
138
   bundle install
143
   bundle install
139
   gem build trackler.gemspec
144
   gem build trackler.gemspec
237
   clean "${build_dir}"
242
   clean "${build_dir}"
238
 
243
 
239
   # Make a version of trackler that includes the source from this repo.
244
   # Make a version of trackler that includes the source from this repo.
245
+  git_clone "x-api" "${xapi_home}"
240
   git_clone "trackler" "${trackler_home}"
246
   git_clone "trackler" "${trackler_home}"
241
   assert_ruby_installed "${trackler_home}"
247
   assert_ruby_installed "${trackler_home}"
242
-  make_local_trackler "${trackler_home}"
248
+  make_local_trackler "${trackler_home}" "${xapi_home}"
243
 
249
 
244
   # Stand-up a local instance of x-api so we can fetch the exercises through it.
250
   # Stand-up a local instance of x-api so we can fetch the exercises through it.
245
-  git_clone "x-api" "${xapi_home}"
246
   assert_ruby_installed "${xapi_home}"
251
   assert_ruby_installed "${xapi_home}"
247
   start_x_api "${xapi_home}"
252
   start_x_api "${xapi_home}"
248
 
253
 
257
 # Execution begins here...
262
 # Execution begins here...
258
 
263
 
259
 # If any command fails, fail the script.
264
 # If any command fails, fail the script.
260
-set -e
265
+set -ex
261
 SCRIPTPATH=$( pushd `dirname $0` > /dev/null && pwd && popd > /dev/null )
266
 SCRIPTPATH=$( pushd `dirname $0` > /dev/null && pwd && popd > /dev/null )
262
 EXECPATH=$( pwd )
267
 EXECPATH=$( pwd )
263
 # Make output easier to read in CI
268
 # Make output easier to read in CI