diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2e0f1ac4f..3b51af251 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.14 + - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.14 + go-version: 1.15 id: go - name: Check out code into the Go module directory diff --git a/Dockerfile b/Dockerfile index c1e4edd3c..ebbb68988 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=$BUILDPLATFORM golang:1.14 as builder-env +FROM --platform=$BUILDPLATFORM golang:1.15 as builder-env ARG GOPROXY ARG PKG diff --git a/changelogs/unreleased/2974-gliptak b/changelogs/unreleased/2974-gliptak new file mode 100644 index 000000000..39eee13d3 --- /dev/null +++ b/changelogs/unreleased/2974-gliptak @@ -0,0 +1 @@ +Compile with Go 1.15 \ No newline at end of file diff --git a/go.mod b/go.mod index a2fee27e4..84a9fa177 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/vmware-tanzu/velero -go 1.14 +go 1.15 require ( cloud.google.com/go v0.46.2 // indirect diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index 7be5b0d3d..f79762313 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.14 +FROM golang:1.15 ARG GOPROXY