From fc359a0b3b0985837a52147fc6f88686937dcf5e Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Tue, 9 Apr 2019 11:50:02 +0200 Subject: [PATCH] Switch to go1.11 --- .travis.yml | 2 +- hack/lib/constants.sh | 2 +- images/cli-artifacts/Dockerfile.rhel | 2 +- images/cli/Dockerfile.rhel | 2 +- images/hyperkube/Dockerfile.rhel | 2 +- images/hypershift/Dockerfile.rhel | 2 +- images/sdn/Dockerfile.rhel | 2 +- images/template-service-broker/Dockerfile.rhel | 2 +- images/tests/Dockerfile.rhel | 2 +- origin.spec | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65097491d5f3..977712f351e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.7 + - 1.11 install: - export PATH=$GOPATH/bin:./_output/tools/etcd/bin:$PATH diff --git a/hack/lib/constants.sh b/hack/lib/constants.sh index 85cd4d0c7ea5..d51c6c075d99 100755 --- a/hack/lib/constants.sh +++ b/hack/lib/constants.sh @@ -4,7 +4,7 @@ readonly OS_GO_PACKAGE=github.com/openshift/origin -readonly OS_BUILD_ENV_GOLANG="${OS_BUILD_ENV_GOLANG:-1.10}" +readonly OS_BUILD_ENV_GOLANG="${OS_BUILD_ENV_GOLANG:-1.11}" readonly OS_BUILD_ENV_IMAGE="${OS_BUILD_ENV_IMAGE:-openshift/origin-release:golang-${OS_BUILD_ENV_GOLANG}}" readonly OS_REQUIRED_GO_VERSION="go${OS_BUILD_ENV_GOLANG}" readonly OS_GLIDE_MINOR_VERSION="13" diff --git a/images/cli-artifacts/Dockerfile.rhel b/images/cli-artifacts/Dockerfile.rhel index ec93ddd484f0..68601874dc51 100644 --- a/images/cli-artifacts/Dockerfile.rhel +++ b/images/cli-artifacts/Dockerfile.rhel @@ -2,7 +2,7 @@ # It builds an image containing the Mac version of the installer layered on top of the # Linux installer image. -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN OS_RELEASE_WITHOUT_LINKS=y OS_BUILD_RELEASE_ARCHIVES=n OS_ONLY_BUILD_PLATFORMS="^(darwin|windows)/amd64$" bash -x hack/build-cross.sh diff --git a/images/cli/Dockerfile.rhel b/images/cli/Dockerfile.rhel index 9c621f990d02..2893acf9896e 100644 --- a/images/cli/Dockerfile.rhel +++ b/images/cli/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN make build WHAT=cmd/oc diff --git a/images/hyperkube/Dockerfile.rhel b/images/hyperkube/Dockerfile.rhel index 6cc26447650d..b2101ac871d1 100644 --- a/images/hyperkube/Dockerfile.rhel +++ b/images/hyperkube/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN make build WHAT=vendor/k8s.io/kubernetes/cmd/hyperkube diff --git a/images/hypershift/Dockerfile.rhel b/images/hypershift/Dockerfile.rhel index 369241e6471b..a7701d4cb46a 100644 --- a/images/hypershift/Dockerfile.rhel +++ b/images/hypershift/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN make build WHAT=cmd/hypershift diff --git a/images/sdn/Dockerfile.rhel b/images/sdn/Dockerfile.rhel index 831a3430999b..4b9ab55ee78c 100644 --- a/images/sdn/Dockerfile.rhel +++ b/images/sdn/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN make build WHAT=" \ diff --git a/images/template-service-broker/Dockerfile.rhel b/images/template-service-broker/Dockerfile.rhel index 201884f18a29..cedb7d034083 100644 --- a/images/template-service-broker/Dockerfile.rhel +++ b/images/template-service-broker/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN make build WHAT=cmd/template-service-broker diff --git a/images/tests/Dockerfile.rhel b/images/tests/Dockerfile.rhel index da705e7ea2a5..d7fd207f75bf 100644 --- a/images/tests/Dockerfile.rhel +++ b/images/tests/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN make build WHAT=cmd/openshift-tests diff --git a/origin.spec b/origin.spec index 3751cf07f7bd..3250eb43bc63 100644 --- a/origin.spec +++ b/origin.spec @@ -6,7 +6,7 @@ %global gopath %{_datadir}/gocode %global import_path github.com/openshift/origin -%global golang_version 1.10 +%global golang_version 1.11 # %commit and %os_git_vars are intended to be set by tito custom builders provided # in the .tito/lib directory. The values in this spec file will not be kept up to date. %{!?commit: