Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[OCPCLOUD-813] Bump scripts to Go 1.13 #80

Merged
merged 1 commit into from
Apr 3, 2020
Merged

[OCPCLOUD-813] Bump scripts to Go 1.13 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
WORKDIR /go/src/github.com/openshift/cluster-api-provider-gcp
COPY . .
# VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ifeq ($(NO_DOCKER), 1)
IMAGE_BUILD_CMD = imagebuilder
CGO_ENABLED = 1
else
DOCKER_CMD := docker run --rm -e CGO_ENABLED=1 -v "$(PWD)":/go/src/github.com/openshift/cluster-api-provider-gcp:Z -w /go/src/openshift/cluster-api-provider-gcp openshift/origin-release:golang-1.12
DOCKER_CMD := docker run --rm -e CGO_ENABLED=1 -v "$(PWD)":/go/src/github.com/openshift/cluster-api-provider-gcp:Z -w /go/src/openshift/cluster-api-provider-gcp openshift/origin-release:golang-1.13
IMAGE_BUILD_CMD = docker build
endif

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openshift/cluster-api-provider-gcp

go 1.12
go 1.13

require (
github.com/blang/semver v3.5.1+incompatible
Expand Down
2 changes: 1 addition & 1 deletion hack/go-fmt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ else
--env IS_CONTAINER=TRUE \
--volume "${PWD}:/go/src/github.com/openshift/cluster-api-provider-gcp:z" \
--workdir /go/src/github.com/openshift/cluster-api-provider-gcp \
openshift/origin-release:golang-1.12 \
openshift/origin-release:golang-1.13 \
./hack/go-fmt.sh "${@}"
fi
2 changes: 1 addition & 1 deletion hack/go-vet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ else
--env IS_CONTAINER=TRUE \
--volume "${PWD}:/go/src/github.com/openshift/cluster-api-provider-gcp:z" \
--workdir /go/src/github.com/openshift/cluster-api-provider-gcp \
openshift/origin-release:golang-1.12 \
openshift/origin-release:golang-1.13 \
./hack/go-vet.sh "${@}"
fi;
2 changes: 1 addition & 1 deletion hack/goimports.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ else
--env IS_CONTAINER=TRUE \
--volume "${PWD}:/go/src/sigs.k8s.io/${REPO_NAME}:z" \
--workdir "/go/src/sigs.k8s.io/${REPO_NAME}" \
openshift/origin-release:golang-1.12 \
openshift/origin-release:golang-1.13 \
./hack/goimports.sh "${@}"
fi
2 changes: 1 addition & 1 deletion hack/gosec.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ else
--env IS_CONTAINER=TRUE \
--volume "${PWD}:/go/src/github.com/openshift/cluster-api-provider-gcp:z" \
--workdir /go/src/github.com/openshift/cluster-api-provider-gcp \
openshift/origin-release:golang-1.12 \
openshift/origin-release:golang-1.13 \
./hack/gosec.sh "${@}"
fi;