Merge branch 'release/0.18'

crystal-lang · Jun 17, 2016 · e9578dd · e9578dd
2 parents 552e9af + a7c95f1
commit e9578dd
Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.18.2 (16-06.2016)
+
+* Fixed building Crystal from the source tarball
+
 ## 0.18.1 (16-06-2016)
 
 * Spec: passing `--profile` shows the slowest 10 specs (thanks @mperham)

diff --git a/spec/std/proc_spec.cr b/spec/std/proc_spec.cr
@@ -6,7 +6,7 @@ describe "Proc" do
     f = ->(x : Int32) { x.to_f }
     f.to_s(str)
     # TODO: Change to .starts_with? "0.18.1" once 0.18.1 is released
-    {% if Crystal::VERSION.starts_with?("0.18.0+") || Crystal::VERSION == "0.18.1" %}
+    {% if Crystal::VERSION.starts_with?("0.18.0+") || Crystal::VERSION.starts_with?("0.18.1") %}
       str.to_s.should eq("#<Proc(Int32, Float64):0x#{f.pointer.address.to_s(16)}>")
     {% else %}
       str.to_s.should eq("#<(Int32 -> Float64):0x#{f.pointer.address.to_s(16)}>")
@@ -19,7 +19,7 @@ describe "Proc" do
     f = ->(x : Int32) { x + a }
     f.to_s(str)
     # TODO: Change to .starts_with? "0.18.1" once 0.18.1 is released
-    {% if Crystal::VERSION.starts_with?("0.18.0+") || Crystal::VERSION == "0.18.1" %}
+    {% if Crystal::VERSION.starts_with?("0.18.0+") || Crystal::VERSION.starts_with?("0.18.1") %}
       str.to_s.should eq("#<Proc(Int32, Float64):0x#{f.pointer.address.to_s(16)}:closure>")
     {% else %}
       str.to_s.should eq("#<(Int32 -> Float64):0x#{f.pointer.address.to_s(16)}:closure>")
@@ -30,7 +30,7 @@ describe "Proc" do
     str = MemoryIO.new
     f = ->(x : Int32) { x.to_f }
     # TODO: Change to .starts_with? "0.18.1" once 0.18.1 is released
-    {% if Crystal::VERSION.starts_with?("0.18.0+") || Crystal::VERSION == "0.18.1" %}
+    {% if Crystal::VERSION.starts_with?("0.18.0+") || Crystal::VERSION.starts_with?("0.18.1") %}
       f.to_s.should eq("#<Proc(Int32, Float64):0x#{f.pointer.address.to_s(16)}>")
     {% else %}
       f.to_s.should eq("#<(Int32 -> Float64):0x#{f.pointer.address.to_s(16)}>")
@@ -42,7 +42,7 @@ describe "Proc" do
     a = 1.5
     f = ->(x : Int32) { x + a }
     # TODO: Change to .starts_with? "0.18.1" once 0.18.1 is released
-    {% if Crystal::VERSION.starts_with?("0.18.0+") || Crystal::VERSION == "0.18.1" %}
+    {% if Crystal::VERSION.starts_with?("0.18.0+") || Crystal::VERSION.starts_with?("0.18.1") %}
       f.to_s.should eq("#<Proc(Int32, Float64):0x#{f.pointer.address.to_s(16)}:closure>")
     {% else %}
       f.to_s.should eq("#<(Int32 -> Float64):0x#{f.pointer.address.to_s(16)}:closure>")

diff --git a/spec/std/tuple_spec.cr b/spec/std/tuple_spec.cr
@@ -271,7 +271,7 @@ describe "Tuple" do
   it "does types" do
     tuple = {1, 'a', "hello"}
     # TODO: Change to .starts_with? "0.18.1" once 0.18.1 is released
-    {% if Crystal::VERSION.starts_with?("0.18.0+") || Crystal::VERSION == "0.18.1" %}
+    {% if Crystal::VERSION.starts_with?("0.18.0+") || Crystal::VERSION.starts_with?("0.18.1") %}
       tuple.types.to_s.should eq("Tuple(Int32, Char, String)")
     {% else %}
       tuple.types.to_s.should eq("{Int32, Char, String}")

diff --git a/src/compiler/crystal/config.cr b/src/compiler/crystal/config.cr
@@ -28,7 +28,7 @@ module Crystal
       config_version = {{env("CRYSTAL_CONFIG_VERSION")}}
       return {config_version, nil} if config_version
 
-      git_version = {{`(git describe --tags --long --always 2>/dev/null)`.stringify.chomp}}
+      git_version = {{`(git describe --tags --long --always 2>/dev/null) || true`.stringify.chomp}}
 
       # Failed git and no explicit version set: ""
       # We inherit the version of the compiler building us for now.