From 9b7c2c582603df6008ae06bef725b8031fd6d801 Mon Sep 17 00:00:00 2001
From: Callum Barratt <callum.barratt@sky.uk>
Date: Thu, 19 May 2016 08:55:33 +0100
Subject: [PATCH] Fix CI builds

---
 .tool-versions                         |  2 --
 circle_pre_build.sh => bin/circleci.sh | 17 +++++++++++------
 circle.yml                             |  6 +++---
 3 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 .tool-versions
 rename circle_pre_build.sh => bin/circleci.sh (55%)
 mode change 100755 => 100644

diff --git a/.tool-versions b/.tool-versions
deleted file mode 100644
index 1e103c4..0000000
--- a/.tool-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-erlang 18.2.1
-elixir 1.2.1
diff --git a/circle_pre_build.sh b/bin/circleci.sh
old mode 100755
new mode 100644
similarity index 55%
rename from circle_pre_build.sh
rename to bin/circleci.sh
index 88c16fe..d3c6a09
--- a/circle_pre_build.sh
+++ b/bin/circleci.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-# Ensure exit codes other than 0 fail the build
-
 set -e
 
 # Check for asdf
@@ -12,13 +10,20 @@ fi
 asdf plugin-add erlang https://github.com/HashNuke/asdf-erlang.git
 asdf plugin-add elixir https://github.com/HashNuke/asdf-elixir.git
 
+# Extract vars from elixir_buildpack.config
+. elixir_buildpack.config
+
+# Write .tool-versions
+echo "erlang $erlang_version" >> .tool-versions
+echo "elixir $elixir_version" >> .tool-versions
+
 # Install erlang/elixir
-asdf install erlang 18.3
-asdf install elixir 1.2.5
+asdf install erlang $erlang_version
+asdf install elixir $elixir_version
 
 # Get dependencies
-yes | mix local.rebar
-yes | mix local.hex
+mix local.rebar --force
+mix local.hex --force
 yes | mix deps.get
 
 # Exit successfully
diff --git a/circle.yml b/circle.yml
index 63581b8..646c6db 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,16 +6,16 @@ machine:
   services:
     - postgresql
   node:
-    version: 5.1.0
+    version: 5.11.0
 dependencies:
   cache_directories:
     - ~/.asdf
     - deps
     - _build
   pre:
-    - ./circle_pre_build.sh
+    - ./bin/circleci.sh
     - mix deps.compile
     - mix compile
 test:
   override:
-    - mix test
+    - mix test --trace