Kaynağa Gözat

Ensure journey test versions trackler as X-API expects.

John S. Ryan 9 yıl önce
ebeveyn
işleme
68684542b4
1 değiştirilmiş dosya ile 9 ekleme ve 4 silme
  1. 9
    4
      bin/journey-test.sh

+ 9
- 4
bin/journey-test.sh Dosyayı Görüntüle

@@ -121,7 +121,8 @@ git_clone() {
121 121
 
122 122
 make_local_trackler() {
123 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 127
   local xjava=$( pwd )
127 128
   pushd ${trackler}
@@ -134,6 +135,10 @@ make_local_trackler() {
134 135
   cp ${xjava}/config.json tracks/java
135 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 142
   gem install bundler
138 143
   bundle install
139 144
   gem build trackler.gemspec
@@ -237,12 +242,12 @@ main() {
237 242
   clean "${build_dir}"
238 243
 
239 244
   # Make a version of trackler that includes the source from this repo.
245
+  git_clone "x-api" "${xapi_home}"
240 246
   git_clone "trackler" "${trackler_home}"
241 247
   assert_ruby_installed "${trackler_home}"
242
-  make_local_trackler "${trackler_home}"
248
+  make_local_trackler "${trackler_home}" "${xapi_home}"
243 249
 
244 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 251
   assert_ruby_installed "${xapi_home}"
247 252
   start_x_api "${xapi_home}"
248 253
 
@@ -257,7 +262,7 @@ main() {
257 262
 # Execution begins here...
258 263
 
259 264
 # If any command fails, fail the script.
260
-set -e
265
+set -ex
261 266
 SCRIPTPATH=$( pushd `dirname $0` > /dev/null && pwd && popd > /dev/null )
262 267
 EXECPATH=$( pwd )
263 268
 # Make output easier to read in CI