#!/bin/bash -xe
export RAILS_ENV=test
export DISPLAY=":99"

bundle install --path "/home/jenkins/bundles/${JOB_NAME}" --deployment
bundle exec rake db:reset
bundle exec rake assets:clean assets:precompile
bundle exec rake
bundle exec rake check_for_bad_time_handling

#!/bin/bash -xe
export RAILS_ENV=test
export DISPLAY=":99"

# 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/jenkins/bundles/${JOB_NAME}" --deployment
bundle exec rake db:reset
bundle exec rake assets:clean assets:precompile
bundle exec rake
bundle exec rake check_for_bad_time_handling

Check if there are conflicts on master when running the build
Check if there are conflicts on master when running the build

- This is taken from
  https://github.com/alphagov/specialist-publisher/commit/9a097249c142c6e7146706dfd5fc0282c92f4886, as a thing discussed in tech lead standup that could be useful and passed to me to do via Jamie.
