From dfd5724505b801bf22dac27a39aa82808b95e917 Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Sat, 10 Mar 2018 17:37:51 -0800 Subject: [PATCH 1/4] Use llvm5 for darwin build in CI --- bin/ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ci b/bin/ci index 51446d3c94a1..76d8fbef3c66 100755 --- a/bin/ci +++ b/bin/ci @@ -84,7 +84,7 @@ prepare_build() { on_linux docker pull "jhass/crystal-build-$ARCH" - on_osx brew install llvm crystal-lang + on_osx brew install llvm@5 crystal-lang } with_build_env() { From 273f78106635f676c445b51642121adfebfb89ab Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Sat, 10 Mar 2018 17:49:43 -0800 Subject: [PATCH 2/4] Force binaries of llvm in PATH --- bin/ci | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/ci b/bin/ci index 76d8fbef3c66..1b42190067c0 100755 --- a/bin/ci +++ b/bin/ci @@ -85,6 +85,9 @@ prepare_build() { on_linux docker pull "jhass/crystal-build-$ARCH" on_osx brew install llvm@5 crystal-lang + + # Make sure binaries from llvm are available in PATH + on_osx brew link --force llvm@5 } with_build_env() { From e09b818e165df923e099ddf6a72cdc75618416a4 Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Sat, 10 Mar 2018 21:32:31 -0800 Subject: [PATCH 3/4] DRY for the llvm's version crystal-lang's depends on --- bin/ci | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/ci b/bin/ci index 1b42190067c0..59d4eaa5c1ce 100755 --- a/bin/ci +++ b/bin/ci @@ -84,10 +84,11 @@ prepare_build() { on_linux docker pull "jhass/crystal-build-$ARCH" - on_osx brew install llvm@5 crystal-lang + on_osx brew install crystal-lang # Make sure binaries from llvm are available in PATH - on_osx brew link --force llvm@5 + on_osx OSX_LLVM_PACKAGE=`brew info --json=v1 crystal-lang | jq '.[].dependencies | .[] | select(startswith("llvm"))'` + on_osx brew link --force $OSX_LLVM_PACKAGE } with_build_env() { From 20fbfd18adfb88fd25820c93f6153a83119274b6 Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Sat, 10 Mar 2018 21:34:39 -0800 Subject: [PATCH 4/4] Install jq --- bin/ci | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/ci b/bin/ci index 59d4eaa5c1ce..0d4f15f9db41 100755 --- a/bin/ci +++ b/bin/ci @@ -87,6 +87,7 @@ prepare_build() { on_osx brew install crystal-lang # Make sure binaries from llvm are available in PATH + on_osx brew install jq on_osx OSX_LLVM_PACKAGE=`brew info --json=v1 crystal-lang | jq '.[].dependencies | .[] | select(startswith("llvm"))'` on_osx brew link --force $OSX_LLVM_PACKAGE }