From bd4ea81a5c523a05b7e754ea2116f5922f929102 Mon Sep 17 00:00:00 2001 From: Sunjay Bhatia Date: Thu, 12 Oct 2023 13:04:17 +0000 Subject: [PATCH 1/2] Bump go to 1.21.3 Signed-off-by: Sunjay Bhatia --- .github/workflows/build_daily.yaml | 2 +- .github/workflows/prbuild.yaml | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_daily.yaml b/.github/workflows/build_daily.yaml index 7b14eb95916..021a3a0b10e 100644 --- a/.github/workflows/build_daily.yaml +++ b/.github/workflows/build_daily.yaml @@ -10,7 +10,7 @@ on: env: GOPROXY: https://proxy.golang.org/ SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - GO_VERSION: 1.21.1 + GO_VERSION: 1.21.3 jobs: e2e-envoy-xds: runs-on: ubuntu-latest diff --git a/.github/workflows/prbuild.yaml b/.github/workflows/prbuild.yaml index 7521801a63b..b679bebad46 100644 --- a/.github/workflows/prbuild.yaml +++ b/.github/workflows/prbuild.yaml @@ -11,7 +11,7 @@ on: env: GOPROXY: https://proxy.golang.org/ SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - GO_VERSION: 1.21.1 + GO_VERSION: 1.21.3 jobs: lint: runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 92ab61c59a0..27f41d2ef5b 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ endif IMAGE_PLATFORMS ?= linux/amd64,linux/arm64 # Base build image to use. -BUILD_BASE_IMAGE ?= golang:1.21.1 +BUILD_BASE_IMAGE ?= golang:1.21.3 # Enable build with CGO. BUILD_CGO_ENABLED ?= 0 From 4987bd75e9593ac4810dd0a992e7cc67130409e1 Mon Sep 17 00:00:00 2001 From: Sunjay Bhatia Date: Thu, 12 Oct 2023 13:06:07 +0000 Subject: [PATCH 2/2] changelog Signed-off-by: Sunjay Bhatia --- changelogs/unreleased/5783-skriss-small.md | 1 - changelogs/unreleased/5841-sunjayBhatia-small.md | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 changelogs/unreleased/5783-skriss-small.md create mode 100644 changelogs/unreleased/5841-sunjayBhatia-small.md diff --git a/changelogs/unreleased/5783-skriss-small.md b/changelogs/unreleased/5783-skriss-small.md deleted file mode 100644 index 80d637776ba..00000000000 --- a/changelogs/unreleased/5783-skriss-small.md +++ /dev/null @@ -1 +0,0 @@ -Updates to Go 1.21.1. See the [Go release notes](https://go.dev/doc/devel/release#go1.21.minor) for more information. \ No newline at end of file diff --git a/changelogs/unreleased/5841-sunjayBhatia-small.md b/changelogs/unreleased/5841-sunjayBhatia-small.md new file mode 100644 index 00000000000..4f254e3482d --- /dev/null +++ b/changelogs/unreleased/5841-sunjayBhatia-small.md @@ -0,0 +1 @@ +Updates to Go 1.21.3. See the [Go release notes](https://go.dev/doc/devel/release#go1.21.minor) for more information.