Fix CI builds

cbarratt · May 19, 2016 · 9b7c2c5 · 9b7c2c5
1 parent a6c353e
commit 9b7c2c5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/.tool-versions b/.tool-versions
diff --git a/circle_pre_build.sh → bin/circleci.sh b/circle_pre_build.sh → 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
@@ -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