#!/bin/sh

set -e -x

bundle install --deployment

bundle exec rake test whitehall:slug_check hosts:validate

exit $?

#!/bin/sh

set -e -x

# 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 --deployment

bundle exec rake test whitehall:slug_check hosts:validate

exit $?

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.
