From 30cdcc751dd4c2601878d93eab8cc7750f38a609 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Wed, 12 Jul 2023 00:59:57 -0700 Subject: [PATCH] all: update Go builder from 1.20.5 to 1.20.6 See https://github.com/golang/go/issues?q=milestone%3AGo1.20.6+label%3ACherryPickApproved --- .github/workflows/check-licenses.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/main.yml | 6 +++--- app/vmui/Dockerfile-web | 2 +- deployment/docker/Makefile | 2 +- docs/CHANGELOG.md | 2 ++ snap/local/Makefile | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml index 5fb182db9..717dde771 100644 --- a/.github/workflows/check-licenses.yml +++ b/.github/workflows/check-licenses.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Go uses: actions/setup-go@main with: - go-version: 1.20.5 + go-version: 1.20.6 id: go - name: Code checkout uses: actions/checkout@master diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7f315005b..c7c4ebf26 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -57,7 +57,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.20.5 + go-version: 1.20.6 check-latest: true cache: true if: ${{ matrix.language == 'go' }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3957c5d3e..4bbee329f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: 1.20.5 + go-version: 1.20.6 check-latest: true cache: true @@ -56,7 +56,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: 1.20.5 + go-version: 1.20.6 check-latest: true cache: true @@ -81,7 +81,7 @@ jobs: id: go uses: actions/setup-go@v4 with: - go-version: 1.20.5 + go-version: 1.20.6 check-latest: true cache: true diff --git a/app/vmui/Dockerfile-web b/app/vmui/Dockerfile-web index 19539efce..37e38d440 100644 --- a/app/vmui/Dockerfile-web +++ b/app/vmui/Dockerfile-web @@ -1,4 +1,4 @@ -FROM golang:1.20.5 as build-web-stage +FROM golang:1.20.6 as build-web-stage COPY build /build WORKDIR /build diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index 2a417fc00..32897e32d 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -9,7 +9,7 @@ ROOT_IMAGE ?= alpine:3.18.2 # TODO: sync it with ROOT_IMAGE when it will be fixed in the new alpine releases CERTS_IMAGE := alpine:3.17.3 -GO_BUILDER_IMAGE := golang:1.20.5-alpine +GO_BUILDER_IMAGE := golang:1.20.6-alpine BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr :/ __)-1 BASE_IMAGE := local/base:1.1.4-$(shell echo $(ROOT_IMAGE) | tr :/ __)-$(shell echo $(CERTS_IMAGE) | tr :/ __) DOCKER_COMPOSE ?= docker compose diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 2cdd7c826..899d9cfdb 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -25,6 +25,8 @@ The following tip changes can be tested by building VictoriaMetrics components f ## tip * SECURITY: upgrade base docker image (alpine) from 3.18.0 to 3.18.2. See [alpine 3.18.2 release notes](https://alpinelinux.org/posts/Alpine-3.15.9-3.16.6-3.17.4-3.18.2-released.html). +* SECURITY: upgrade Go builder from Go1.20.5 to Go1.20.6. See [the list of issues addressed in Go1.20.6](https://github.com/golang/go/issues?q=milestone%3AGo1.20.6+label%3ACherryPickApproved). + * FEATURE: [vmctl](https://docs.victoriametrics.com/vmctl.html): add verbose output for docker installations or when TTY isn't available. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4081). * FEATURE: [vmctl](https://docs.victoriametrics.com/vmctl.html): interrupt backoff retries when import process is cancelled. The change makes vmctl more responsive in case of errors during the import. See [this pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/4442). diff --git a/snap/local/Makefile b/snap/local/Makefile index 0e9f826e7..9ad685cf0 100644 --- a/snap/local/Makefile +++ b/snap/local/Makefile @@ -1,4 +1,4 @@ -GO_VERSION ?=1.20.5 +GO_VERSION ?=1.20.6 SNAP_BUILDER_IMAGE := local/snap-builder:2.0.0-$(shell echo $(GO_VERSION) | tr :/ __)