Просмотр исходного кода

Base patched Trackler gem off actual version tag.

- was: hand-rolling a version of Trackler based of master and then
  applying changes from the PR/commit/local change to that trackler gem.
- now: using the exact tagged version of Trackler as the basis for the
  hand-rolled gem.

This fixes the issue where a change make to Trackler's master is
incompatible with the current version of x-api.  In short, we were
building the Trackler gem wrong.
John S. Ryan 9 лет назад
Родитель
Сommit
f413146adc
1 измененных файлов: 5 добавлений и 4 удалений
  1. 5
    4
      bin/journey-test.sh

+ 5
- 4
bin/journey-test.sh Просмотреть файл

@@ -143,6 +143,11 @@ make_local_trackler() {
143 143
 
144 144
   local xjava=$( pwd )
145 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 151
   git submodule init -- common
147 152
   git submodule update
148 153
 
@@ -152,10 +157,6 @@ make_local_trackler() {
152 157
   cp ${xjava}/config.json tracks/java
153 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 160
   gem install bundler
160 161
   bundle install
161 162
   gem build trackler.gemspec