From a2d2d2981cb03088f094605d8f99d076b76a7144 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Sat, 25 Aug 2018 09:35:20 +0200 Subject: [PATCH] upgrade to go 1.11 --- .travis.yml | 2 +- appveyor.yml | 2 ++ release/install.sh | 4 ++-- release/release-ci.sh | 2 +- shippable.yml | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc7e37a22..4ce4f6829 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: required language: go go: -- "1.10.2" +- "1.11" go_import_path: v2ray.com/core git: depth: 5 diff --git a/appveyor.yml b/appveyor.yml index fa006198b..801fe6bda 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,6 +10,8 @@ branches: version: "1.0.{build}" +stack: "go 1.11" + environment: global: GOPATH: C:\gopath diff --git a/release/install.sh b/release/install.sh index 764e764c7..ff89a0e48 100755 --- a/release/install.sh +++ b/release/install.sh @@ -1,7 +1,7 @@ #!/bin/bash -GO_AMD64=https://storage.googleapis.com/golang/go1.10.linux-amd64.tar.gz -GO_X86=https://storage.googleapis.com/golang/go1.10.linux-386.tar.gz +GO_AMD64=https://storage.googleapis.com/golang/go1.11.linux-amd64.tar.gz +GO_X86=https://storage.googleapis.com/golang/go1.11.linux-386.tar.gz ARCH=$(uname -m) GO_CUR=${GO_AMD64} diff --git a/release/release-ci.sh b/release/release-ci.sh index d6728f8a0..e71f06f16 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.10.2.linux-amd64.tar.gz +curl -L -o ${GO_INSTALL} https://storage.googleapis.com/golang/go1.11.linux-amd64.tar.gz tar -C /usr/local -xzf ${GO_INSTALL} export PATH=$PATH:/usr/local/go/bin diff --git a/shippable.yml b/shippable.yml index 1bf972827..efabe649c 100644 --- a/shippable.yml +++ b/shippable.yml @@ -10,7 +10,7 @@ branches: build: ci: - - curl -L -o golang.tar.gz https://dl.google.com/go/go1.10.3.linux-arm64.tar.gz + - curl -L -o golang.tar.gz https://dl.google.com/go/go1.11.linux-arm64.tar.gz - tar -C /usr/local -xzf golang.tar.gz - export PATH=$PATH:/usr/local/go/bin - export GOPATH=/v2ray