Add dependency on choice-0.2.0 (#6)

* Add dependency on choice-0.2.0 * Enable parallel builds
tweag · Feb 15, 2017 · f3454ee · f3454ee
1 parent d9da523
commit f3454ee
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,14 +6,16 @@ branches:
   only:
   - leapyear-patchset
 env:
-  global:
-  - CASHER_TIME_OUT=3600
+- [email protected]
+- [email protected]  # MacOS 10.11 (El Capitan)
+- [email protected]  # MacOS 10.12 (Sierra)
+global:
+- CASHER_TIME_OUT=3600
 before_install:
 - openssl aes-256-cbc -K $encrypted_02288c648d1c_key -iv $encrypted_02288c648d1c_iv -in leapyear-builder-us-west-1.pem.enc -out leapyear-builder-us-west-1.pem -d
 - chmod 0600 leapyear-builder-us-west-1.pem
+- echo "Building on $BUILD_MACHINE"
 script:
-- "./remote_build.sh leapyear-builder-us-west-1.pem [email protected]" # MacOS 10.12 (Sierra)
-- "./remote_build.sh leapyear-builder-us-west-1.pem [email protected]"
-- "./remote_build.sh leapyear-builder-us-west-1.pem [email protected]" # MacOS 10.11 (El Capitan)
+- ./remote_build.sh leapyear-builder-us-west-1.pem $BUILD_MACHINE
 notifications:
   slack: leapyear:o4w7lKexDuDCzmPSayJuQg9m
diff --git a/jni/stack.yaml b/jni/stack.yaml
@@ -8,6 +8,7 @@ packages:
 
 extra-deps:
 - thread-local-storage-0.1.0.4
+- choice-0.2.0
 
 nix:
   enable: true

diff --git a/jvm/default.nix b/jvm/default.nix
@@ -1,6 +1,6 @@
 let
   pkgs = import ./nixpkgs.nix;
-  
+
   hsPkgs =
     pkgs.haskell // {
       packages = pkgs.haskell.packages // {

diff --git a/jvm/stack.yaml b/jvm/stack.yaml
@@ -9,6 +9,7 @@ packages:
 
 extra-deps:
 - thread-local-storage-0.1.0.4
+- choice-0.2.0
 
 nix:
   enable: true

diff --git a/remote_build.sh b/remote_build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -x 
+set -x
 
 KEYFILE="$1"
 USER_AT_IP="$2"