From d3bcc6a66b8cc4f60747ed9b3834c93fcad27540 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Tue, 13 Apr 2021 15:32:46 +0200 Subject: [PATCH] Update Go to 1.16 This commit updates Go to 1.16, a required change because of the use of `os.WriteFile` in one of the tests introduced by commit b5004a93bc4b63d9be225cb068bdbec33b4f29de. Normally _just_ this would not justify the change, but given the introduction of breaking changes (and thereby forcing a MINOR update anyway), and the various file{system, path} improvements introduced in Go 1.16 like [`filepath#WalkDir`](https://golang.org/pkg/path/filepath/#WalkDir), going ahead with this should be fine. Signed-off-by: Hidde Beydals --- .github/actions/run-tests/Dockerfile | 2 +- Dockerfile | 2 +- api/go.mod | 2 +- go.mod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/run-tests/Dockerfile b/.github/actions/run-tests/Dockerfile index c849027d..22fd823c 100644 --- a/.github/actions/run-tests/Dockerfile +++ b/.github/actions/run-tests/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15-alpine +FROM golang:1.16-alpine # Add any build or testing essential system packages RUN apk add --no-cache build-base git pkgconf diff --git a/Dockerfile b/Dockerfile index a8f9704f..0af148a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Docker buildkit multi-arch build requires golang alpine -FROM golang:1.15-alpine as builder +FROM golang:1.16-alpine as builder RUN apk add gcc pkgconfig libc-dev RUN apk add --no-cache musl~=1.2 libgit2-dev~=1.1 diff --git a/api/go.mod b/api/go.mod index 6ff88321..f0c2f08c 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/fluxcd/source-controller/api -go 1.15 +go 1.16 require ( github.com/fluxcd/pkg/apis/meta v0.8.0 diff --git a/go.mod b/go.mod index 52d18006..75a9f325 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fluxcd/source-controller -go 1.15 +go 1.16 replace github.com/fluxcd/source-controller/api => ./api