Browse Source

Merge pull request #431 from jtigger/fix-bundler-patching

Base patched Trackler gem off actual version tag.
John Ryan 9 years ago
parent
commit
d4522cd3bb
1 changed files with 5 additions and 4 deletions
  1. 5
    4
      bin/journey-test.sh

+ 5
- 4
bin/journey-test.sh View File

143
 
143
 
144
   local xjava=$( pwd )
144
   local xjava=$( pwd )
145
   pushd ${trackler}
145
   pushd ${trackler}
146
+
147
+  # Get the version of Trackler x-api is currently using
148
+  local version=$( grep -m 1 'trackler' ${xapi_home}/Gemfile.lock | sed 's/.*(//' | sed 's/)//' )
149
+
150
+  git checkout v${version}
146
   git submodule init -- common
151
   git submodule init -- common
147
   git submodule update
152
   git submodule update
148
 
153
 
152
   cp ${xjava}/config.json tracks/java
157
   cp ${xjava}/config.json tracks/java
153
   cp -r ${xjava}/exercises tracks/java
158
   cp -r ${xjava}/exercises tracks/java
154
 
159
 
155
-  # Set the version to that expected by x-api
156
-  version=$( grep -m 1 'trackler' ${xapi_home}/Gemfile.lock | sed 's/.*(//' | sed 's/)//' )
157
-  echo "module Trackler VERSION = \"${version}\" end" > lib/trackler/version.rb
158
-
159
   gem install bundler
160
   gem install bundler
160
   bundle install
161
   bundle install
161
   gem build trackler.gemspec
162
   gem build trackler.gemspec