#!/bin/bash -x

set -e

bundle install --path "${HOME}/bundles/${JOB_NAME}"

# DELETE STATIC SYMLINKS AND RECONNECT...
for d in images javascripts templates stylesheets; do
  rm -f public/$d
  ln -s ../../../Static/workspace/public/$d public/
done

USE_SIMPLECOV=true RACK_ENV=test bundle exec rake ci:setup:minitest test --trace

#!/bin/bash -x

set -e

# Try to merge master into the current branch, and abort if it doesn't exit
# cleanly (ie there are conflicts). This will be a noop if the current branch
# is master.
git merge --no-commit origin/master || git merge --abort

bundle install --path "${HOME}/bundles/${JOB_NAME}"

# DELETE STATIC SYMLINKS AND RECONNECT...
for d in images javascripts templates stylesheets; do
  rm -f public/$d
  ln -s ../../../Static/workspace/public/$d public/
done

USE_SIMPLECOV=true RACK_ENV=test bundle exec rake ci:setup:minitest test --trace

Make Jenkins test merge result of branches
Make Jenkins test merge result of branches

Almost all of the time we are writing code to be merged into master
sooner rather than later. Rather than testing the HEAD of the branch in
Jenkins this commit adds a command to the build script which merges the
branch with master before building it.
