From 012a1b54bc5d3f38fb9e6b961eae372a39459d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 11 Jun 2019 13:05:47 -0400 Subject: [PATCH] add /usr/local/go/bin as proper Go path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- _assets/ci/Jenkinsfile | 2 +- _assets/ci/Jenkinsfile.android | 2 +- _assets/ci/Jenkinsfile.docker | 2 +- _assets/ci/Jenkinsfile.ios | 2 +- _assets/ci/Jenkinsfile.linux | 2 +- _assets/ci/Jenkinsfile.tests | 2 +- _assets/ci/Jenkinsfile.xgo | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_assets/ci/Jenkinsfile b/_assets/ci/Jenkinsfile index 2eb434de9..a51957fa1 100644 --- a/_assets/ci/Jenkinsfile +++ b/_assets/ci/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { STATUS_PATH = "${env.WORKSPACE}/src/github.com/status-im/status-go" CI_DIR = "${env.STATUS_PATH}/_assets/ci" GOPATH = "${env.WORKSPACE}" - PATH = "${env.PATH}:${env.GOPATH}/bin" + PATH = "/usr/local/go/bin:${env.PATH}:${env.GOPATH}/bin" /* This will override the var in Makefile */ RELEASE_DIR = "${env.WORKSPACE}/pkg" } diff --git a/_assets/ci/Jenkinsfile.android b/_assets/ci/Jenkinsfile.android index f4da81941..188341f4d 100644 --- a/_assets/ci/Jenkinsfile.android +++ b/_assets/ci/Jenkinsfile.android @@ -31,7 +31,7 @@ pipeline { STATUS_PATH = "${env.WORKSPACE}/src/github.com/status-im/status-go" CI_DIR = "${env.STATUS_PATH}/_assets/ci" GOPATH = "${env.WORKSPACE}" - PATH = "${env.PATH}:${env.GOPATH}/bin" + PATH = "/usr/local/go/bin:${env.PATH}:${env.GOPATH}/bin" ANDROID_HOME = '/usr/lib/android-sdk' ANDROID_SDK_ROOT = '/usr/lib/android-sdk' /* gomobile requires a specific NDK version */ diff --git a/_assets/ci/Jenkinsfile.docker b/_assets/ci/Jenkinsfile.docker index ca1df0a77..a71278f6a 100644 --- a/_assets/ci/Jenkinsfile.docker +++ b/_assets/ci/Jenkinsfile.docker @@ -30,7 +30,7 @@ pipeline { STATUS_PATH = "${env.WORKSPACE}/src/github.com/status-im/status-go" CI_DIR = "${env.STATUS_PATH}/_assets/ci" GOPATH = "${env.WORKSPACE}" - PATH = "${env.PATH}:${env.GOPATH}/bin" + PATH = "/usr/local/go/bin:${env.PATH}:${env.GOPATH}/bin" /* docker image settings */ IMAGE_NAME = "statusteam/status-go" IMAGE_TAG = "deploy-test" diff --git a/_assets/ci/Jenkinsfile.ios b/_assets/ci/Jenkinsfile.ios index 7c3148bf3..1cb2ba3af 100644 --- a/_assets/ci/Jenkinsfile.ios +++ b/_assets/ci/Jenkinsfile.ios @@ -31,7 +31,7 @@ pipeline { STATUS_PATH = "${env.WORKSPACE}/src/github.com/status-im/status-go" CI_DIR = "${env.STATUS_PATH}/_assets/ci" GOPATH = "${env.WORKSPACE}" - PATH = "${env.PATH}:${env.GOPATH}/bin" + PATH = "/usr/local/go/bin:${env.PATH}:${env.GOPATH}/bin" } stages { diff --git a/_assets/ci/Jenkinsfile.linux b/_assets/ci/Jenkinsfile.linux index 1092bf4f0..adf5cb9d4 100644 --- a/_assets/ci/Jenkinsfile.linux +++ b/_assets/ci/Jenkinsfile.linux @@ -31,7 +31,7 @@ pipeline { STATUS_PATH = "${env.WORKSPACE}/src/github.com/status-im/status-go" CI_DIR = "${env.STATUS_PATH}/_assets/ci" GOPATH = "${env.WORKSPACE}" - PATH = "${env.PATH}:${env.GOPATH}/bin" + PATH = "/usr/local/go/bin:${env.PATH}:${env.GOPATH}/bin" } stages { diff --git a/_assets/ci/Jenkinsfile.tests b/_assets/ci/Jenkinsfile.tests index a0140544c..c1ad19efa 100644 --- a/_assets/ci/Jenkinsfile.tests +++ b/_assets/ci/Jenkinsfile.tests @@ -26,7 +26,7 @@ pipeline { STATUS_PATH = 'src/github.com/status-im/status-go' CI_DIR = "${env.STATUS_PATH}/_assets/ci" GOPATH = "${env.WORKSPACE}" - PATH = "${env.PATH}:${env.GOPATH}/bin" + PATH = "/usr/local/go/bin:${env.PATH}:${env.GOPATH}/bin" } stages { diff --git a/_assets/ci/Jenkinsfile.xgo b/_assets/ci/Jenkinsfile.xgo index 82b4151c9..6434fb362 100644 --- a/_assets/ci/Jenkinsfile.xgo +++ b/_assets/ci/Jenkinsfile.xgo @@ -32,7 +32,7 @@ pipeline { STATUS_PATH = "${env.WORKSPACE}/src/github.com/status-im/status-go" CI_DIR = "${env.STATUS_PATH}/_assets/ci" GOPATH = "${env.WORKSPACE}" - PATH = "${env.PATH}:${env.GOPATH}/bin" + PATH = "/usr/local/go/bin:${env.PATH}:${env.GOPATH}/bin" GOCACHE = "off" }