Skip to content

Commit

Permalink
ci: make sure gem-test uses the CI branch's task
Browse files Browse the repository at this point in the history
  • Loading branch information
flavorjones committed Nov 26, 2019
1 parent 09e6762 commit 1f0d41c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
5 changes: 4 additions & 1 deletion concourse/tasks/gem-test/gem-build-java.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ pushd nokogiri

bundle install --local || bundle install

bundle exec rake set-version-to-timestamp
# generate a fake version number
cp -f ../ci/tasks/set-version-to-timestamp.rb tasks/set-version-to-timestamp.rb
bundle exec rake -f tasks/set-version-to-timestamp.rb set-version-to-timestamp

bundle exec rake java gem

mkdir -p ${OUTPUT_DIR}
Expand Down
6 changes: 5 additions & 1 deletion concourse/tasks/gem-test/gem-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ pushd nokogiri
# TODO we're only compiling so that we retrieve libxml2/libxslt
# tarballs, we can do better a couple of different ways
bundle exec rake clean compile
bundle exec rake set-version-to-timestamp

# generate a fake version number
cp -f ../ci/tasks/set-version-to-timestamp.rb tasks/set-version-to-timestamp.rb
bundle exec rake -f tasks/set-version-to-timestamp.rb set-version-to-timestamp

bundle exec rake gem

mkdir -p ${OUTPUT_DIR}
Expand Down

0 comments on commit 1f0d41c

Please sign in to comment.