Merge pull request #104 from MaciekPytel/go_18

Update to go1.8.3
This commit is contained in:
Marcin Wielgus 2017-06-02 15:13:50 +02:00 committed by GitHub
commit 4ead3faa05
4 changed files with 6 additions and 6 deletions

View File

@ -7,7 +7,7 @@ language: go
matrix:
include:
- go: 1.7
- go: 1.8
install:
- mkdir -p $HOME/gopath/src/k8s.io

View File

@ -1,6 +1,6 @@
{
"ImportPath": "k8s.io/contrib/cluster-autoscaler",
"GoVersion": "go1.7",
"GoVersion": "go1.8",
"GodepVersion": "v79",
"Packages": [
"./..."

View File

@ -18,9 +18,9 @@ MAINTAINER Marcin Wielgus "mwielgus@google.com"
RUN apt-get update && apt-get install --yes git wget make\
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN wget https://storage.googleapis.com/golang/go1.7.5.linux-amd64.tar.gz \
&& tar -xvf go1.7.5.linux-amd64.tar.gz \
&& rm go1.7.5.linux-amd64.tar.gz
RUN wget https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz \
&& tar -xvf go1.8.3.linux-amd64.tar.gz \
&& rm go1.8.3.linux-amd64.tar.gz
ENV GOROOT /go
ENV GOPATH /gopath/

View File

@ -24,7 +24,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
GO_VERSION=($(go version))
if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3|go1.4|go1.5|go1.6|go1.7') ]]; then
if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3|go1.4|go1.5|go1.6|go1.7|go1.8') ]]; then
echo "Unknown go version '${GO_VERSION}', skipping gofmt."
exit 1
fi