Skip to content

Commit 860b9ca

Browse files
committed
Sync Go and operator SDK versions used
There were different Go versions used in the Go module, Travis configuration, GitHub Actions configuration, and the project Dockerfile. Also, the version of the operator SDK was different in some places. Sync Go version to be `1.15` everywhere. Make operator SDK version `v0.18.2` consistently.
1 parent 6d8f56e commit 860b9ca

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
language: go
33
go:
4-
- 1.14.x
4+
- 1.15.x
55
services:
66
- docker
77
install:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
FROM openshift/origin-release:golang-1.13 AS builder
5+
FROM openshift/origin-release:golang-1.15 AS builder
66

77
ENV LANG=en_US.utf8
88
ENV GIT_COMMITTER_NAME devtools

HACK.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ In the near future, the above would be setup by the operator.
4141
make clean && make build
4242
```
4343

44-
* This project uses Golang 1.13+ and operator-sdk 1.15.1.
44+
* This project uses Golang 1.15+ and operator-sdk v0.18.2.
4545
* The controllers create/watch Tekton objects.
4646

4747
# Testing

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ TEST_NAMESPACE ?= default
3030
# CI: tekton pipelines operator version
3131
TEKTON_VERSION ?= v0.20.1
3232
# CI: operator-sdk version
33-
SDK_VERSION ?= v0.17.0
33+
SDK_VERSION ?= v0.18.2
3434

3535
# E2E test flags
3636
TEST_E2E_FLAGS ?= -failFast -flakeAttempts=2 -p -randomizeAllSpecs -slowSpecThreshold=300 -timeout=30m -progress -stream -trace -v

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/shipwright-io/build
22

3-
go 1.14
3+
go 1.15
44

55
require (
66
github.com/go-git/go-git/v5 v5.2.0

openshift-ci/Dockerfile.tools

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ WORKDIR /tmp
3232
RUN mkdir -p $GOPATH/bin
3333
RUN mkdir -p /tmp/goroot
3434

35-
RUN curl -Lo go1.13.8.linux-amd64.tar.gz https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz && tar -C /tmp/goroot -xzf go1.13.8.linux-amd64.tar.gz
35+
RUN curl -Lo go1.15.7.linux-amd64.tar.gz https://dl.google.com/go/go1.15.7.linux-amd64.tar.gz && tar -C /tmp/goroot -xzf go1.15.7.linux-amd64.tar.gz
3636
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl $GOPATH/bin/
3737

3838
RUN go get -u github.com/onsi/ginkgo/ginkgo # installs the ginkgo CLI
3939
RUN go get -u github.com/onsi/gomega/... # fetches the matcher library
4040

41-
RUN curl -Lo operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/v0.15.2/operator-sdk-v0.15.2-x86_64-linux-gnu && chmod +x operator-sdk && mv operator-sdk $GOPATH/bin/
41+
RUN curl -Lo operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/v0.18.2/operator-sdk-v0.18.2-x86_64-linux-gnu && chmod +x operator-sdk && mv operator-sdk $GOPATH/bin/
4242

4343
RUN mkdir -p ${GOPATH}/src/${GO_PACKAGE_PATH}/
4444

0 commit comments

Comments
 (0)