#!/bin/bash -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 --path "${HOME}/bundles/${JOB_NAME}"

dropdb transition_test
createdb --encoding=UTF8 --template=template0 transition_test
sudo -u postgres psql -d transition_test -c 'CREATE EXTENSION IF NOT EXISTS pgcrypto'
cat db/structure.sql | psql -d transition_test

RACK_ENV=test bundle exec rake --trace

#!/bin/bash -x
bundle install --path "${HOME}/bundles/${JOB_NAME}"

dropdb transition_test
createdb --encoding=UTF8 --template=template0 transition_test
sudo -u postgres psql -d transition_test -c 'CREATE EXTENSION IF NOT EXISTS pgcrypto'
cat db/structure.sql | psql -d transition_test

RACK_ENV=test bundle exec rake --trace

--- 
+++ 
@@ -1,4 +1,10 @@
 #!/bin/bash -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 --path "${HOME}/bundles/${JOB_NAME}"
 
 dropdb transition_test
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.
