Update CI to use 0.25.1 and osx 10.11 compatible build scripts (#6313)

Also use update brew formula name
crystal-lang · Jul 2, 2018 · 63536bd · 63536bd
1 parent cb41f96
commit 63536bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -67,7 +67,7 @@ jobs:
       - run: |
           git clone https://github.com/crystal-lang/distribution-scripts.git ~/distribution-scripts
           cd ~/distribution-scripts
-          git checkout 359e4ddb8fa22a5313d8b3e8c654af0d23a061b8
+          git checkout 381437c2a7ae3352d709047e158e0f0ff3548af4
       # persist relevant information for build process
       - run: |
           cd ~/distribution-scripts
@@ -78,7 +78,7 @@ jobs:
           echo "export CRYSTAL_SHA1=$CIRCLE_SHA1" >> build.env
 
           # Which previous version use
-          export PREVIOUS_CRYSTAL_BASE_URL="https://github.com/crystal-lang/crystal/releases/download/0.25.0/crystal-0.25.0-1"
+          export PREVIOUS_CRYSTAL_BASE_URL="https://github.com/crystal-lang/crystal/releases/download/0.25.1/crystal-0.25.1-1"
           echo "export PREVIOUS_CRYSTAL_RELEASE_LINUX64_TARGZ=${PREVIOUS_CRYSTAL_BASE_URL}-linux-x86_64.tar.gz" >> build.env
           echo "export PREVIOUS_CRYSTAL_RELEASE_LINUX32_TARGZ=${PREVIOUS_CRYSTAL_BASE_URL}-linux-i686.tar.gz" >> build.env
           echo "export PREVIOUS_CRYSTAL_RELEASE_DARWIN_TARGZ=${PREVIOUS_CRYSTAL_BASE_URL}-darwin-x86_64.tar.gz" >> build.env

diff --git a/bin/ci b/bin/ci
@@ -82,11 +82,11 @@ build() {
 prepare_build() {
   on_linux verify_linux_environment
 
-  on_osx brew install crystal-lang
+  on_osx brew install crystal
 
   # 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 OSX_LLVM_PACKAGE=`brew info --json=v1 crystal | jq '.[].dependencies | .[] | select(startswith("llvm"))'`
   on_osx brew link --force $OSX_LLVM_PACKAGE
 }
 
@@ -98,7 +98,7 @@ with_build_env() {
 
   on_linux verify_linux_environment
 
-  export DOCKER_TEST_PREFIX="crystallang/crystal:0.25.0"
+  export DOCKER_TEST_PREFIX="crystallang/crystal:0.25.1"
 
   case $ARCH in
     x86_64)