Merge branch 'require-go1.9' into devel (fix #139)

vim-volt · Dec 23, 2017 · 31e377e · 31e377e
2 parents ab126f0 + a8fde85
commit 31e377e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,12 +3,12 @@ language: go
 matrix:
   include:
     - os: linux
-      go: 1.9.1
+      go: 1.9
     - os: linux
       go: tip
     - os: osx
       osx_image: xcode8.3
-      go: 1.9.1
+      go: 1.9
     - os: osx
       osx_image: xcode8.3
       go: tip

diff --git a/README.md b/README.md
@@ -125,7 +125,9 @@ Or download binaries from [GitHub releases](https://github.com/vim-volt/volt/rel
 
 ## Build environment
 
-* Go 1.9.1 or higher **with [the patch for os.RemoveAll()](https://go-review.googlesource.com/c/go/+/62970) ([#1](https://github.com/vim-volt/go-volt/issues/1))**
+* Go 1.9 or higher
+  * If you are on WSL (Windows Subsystem Linux), note that you need **[the patch for os.RemoveAll()](https://go-review.googlesource.com/c/go/+/62970) ([#1](https://github.com/vim-volt/go-volt/issues/1))**
+  * But it's a hassle, you can just download linux-386/amd64 binaries from [GitHub releases](https://github.com/vim-volt/volt/releases) :)
 
 ## Self upgrade
 

diff --git a/main.go b/main.go
@@ -1,3 +1,5 @@
+// +build go1.9
+
 package main
 
 import (