From b65f05e95f9706609ff58373a60fb985171ffeea Mon Sep 17 00:00:00 2001 From: andig Date: Wed, 23 Mar 2022 17:19:43 +0100 Subject: [PATCH] Upgrade infrastructure to Go 1.18 without requiring it (#2976) --- .github/workflows/default.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/release.yml | 2 +- .golangci.yml | 2 ++ Dockerfile | 2 +- docker/ci.Dockerfile | 4 +--- docker/tmpl.Dockerfile | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index f0684fed8..dd8ce622c 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: ^1.17 + go-version: ^1.18 id: go - name: Set up Node diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 68947b6e4..e6bda1a43 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -83,7 +83,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: ^1.17 + go-version: ^1.18 id: go - name: Set up Node diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3bc4edbfe..d12d345c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,7 +63,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: ^1.17 + go-version: ^1.18 id: go - name: Setup Node diff --git a/.golangci.yml b/.golangci.yml index 9d2652b35..6723efecb 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,3 +1,5 @@ +run: + go: 1.18 issues: exclude: - .regActualCurrent. is unused diff --git a/Dockerfile b/Dockerfile index 308dd1134..d39799ea4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN make clean ui # STEP 2 build executable binary -FROM golang:1.17-alpine as builder +FROM golang:1.18-alpine as builder # Install git + SSL ca certificates. # Git is required for fetching the dependencies. diff --git a/docker/ci.Dockerfile b/docker/ci.Dockerfile index 366a79da8..93c55d4f4 100644 --- a/docker/ci.Dockerfile +++ b/docker/ci.Dockerfile @@ -1,10 +1,8 @@ # executes binary build excluding UI -# STEP 2 build executable binary -FROM golang:1.17-alpine as builder - # define RELEASE=1 to hide commit hash ARG RELEASE={{ env "RELEASE" }} +FROM golang:1.18-alpine as builder WORKDIR /build diff --git a/docker/tmpl.Dockerfile b/docker/tmpl.Dockerfile index 61c63e882..38d1ead4b 100644 --- a/docker/tmpl.Dockerfile +++ b/docker/tmpl.Dockerfile @@ -20,10 +20,10 @@ RUN make clean ui # STEP 2 build executable binary -FROM golang:1.17-alpine as builder # define RELEASE=1 to hide commit hash ARG RELEASE={{ env "RELEASE" }} +FROM golang:1.18-alpine as builder # Install git + SSL ca certificates. # Git is required for fetching the dependencies.