From f12e3639981fa35e0af086a12bf2d13016ebb338 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Mon, 8 Apr 2024 05:56:25 -0700 Subject: [PATCH] Use Go 1.22 /cherry-pick Signed-off-by: Tamal Saha --- .github/workflows/ci.yml | 4 ++-- Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8351d4b..1bc75cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,10 @@ jobs: name: Build runs-on: ubuntu-20.04 steps: - - name: Set up Go 1.20 + - name: Set up Go 1.22 uses: actions/setup-go@v1 with: - go-version: '1.20' + go-version: '1.22' id: go - uses: actions/checkout@v1 diff --git a/Makefile b/Makefile index c66ba15..975cbf4 100644 --- a/Makefile +++ b/Makefile @@ -51,11 +51,11 @@ BIN_PLATFORMS := $(DOCKER_PLATFORMS) windows/amd64 darwin/amd64 OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS)) ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH)) -BASEIMAGE_PROD ?= gcr.io/distroless/static-debian11 -BASEIMAGE_DBG ?= debian:bullseye +BASEIMAGE_PROD ?= gcr.io/distroless/static-debian12 +BASEIMAGE_DBG ?= debian:bookworm -GO_VERSION ?= 1.20 -BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION) +GO_VERSION ?= 1.22 +BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION) CHART_TEST_IMAGE ?= quay.io/helmpack/chart-testing:v3.5.1 OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)