From 0067d3c80fa283a909130c026804e13de49534cc Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Fri, 31 Aug 2018 12:24:49 +0200 Subject: [PATCH] temporarily rollback to go 1.10 --- common/buf/readv_reader.go | 2 +- release/release-ci.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/buf/readv_reader.go b/common/buf/readv_reader.go index 926a1c7f..9b1a3980 100644 --- a/common/buf/readv_reader.go +++ b/common/buf/readv_reader.go @@ -144,7 +144,7 @@ func init() { value := platform.NewEnvFlag("v2ray.buf.readv").GetValue(func() string { return defaultFlagValue }) switch value { case defaultFlagValue, "auto": - if (runtime.GOARCH == "386" || runtime.GOARCH == "amd64" || runtime.GOARCH == "s390x") && (runtime.GOOS == "linux" || runtime.GOOS == "darwin" || runtime.GOOS == "windows") { + if (runtime.GOARCH == "386" || runtime.GOARCH == "amd64" || runtime.GOARCH == "s390x") && (runtime.GOOS == "linux" || runtime.GOOS == "darwin") { useReadv = true } case "enable": diff --git a/release/release-ci.sh b/release/release-ci.sh index e71f06f1..365dc033 100755 --- a/release/release-ci.sh +++ b/release/release-ci.sh @@ -25,7 +25,7 @@ echo ${SIGN_KEY_PASS} | gpg --passphrase-fd 0 --batch --import /v2ray/build/sign curl -L -o /v2ray/build/releases https://api.github.com/repos/v2ray/v2ray-core/releases GO_INSTALL=golang.tar.gz -curl -L -o ${GO_INSTALL} https://storage.googleapis.com/golang/go1.11.linux-amd64.tar.gz +curl -L -o ${GO_INSTALL} https://storage.googleapis.com/golang/go1.10.4.linux-amd64.tar.gz tar -C /usr/local -xzf ${GO_INSTALL} export PATH=$PATH:/usr/local/go/bin