From 10fb1ffb5b159fc74bfecf12b76bf6af94b01b00 Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Sun, 11 Mar 2018 05:14:06 -0700 Subject: [PATCH] Use the same llvm's version as crystal-lang package for CI's darwin build (#5804) * Use llvm5 for darwin build in CI * Force binaries of llvm in PATH * DRY for the llvm's version crystal-lang's depends on * Install jq --- bin/ci | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/ci b/bin/ci index 51446d3c94a1..0d4f15f9db41 100755 --- a/bin/ci +++ b/bin/ci @@ -84,7 +84,12 @@ prepare_build() { on_linux docker pull "jhass/crystal-build-$ARCH" - on_osx brew install llvm crystal-lang + 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 } with_build_env() {