From b1a8dca58844b7b8817acfd4a89eb5bcc065c822 Mon Sep 17 00:00:00 2001
From: basecommon <devops@elisa.fi>
Date: Mon, 24 Jul 2023 09:02:42 +0000
Subject: [PATCH] update basecommon to 4411461

---
 Makefile                       | 2 +-
 go-40520c8.mk => go-4411461.mk | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename go-40520c8.mk => go-4411461.mk (98%)

diff --git a/Makefile b/Makefile
index 650765a..2c68890 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Download wanted go.mk version automatically if not present.
-BASE_VERSION  := 40520c8
+BASE_VERSION  := 4411461
 BASE_MAKE     := go-${BASE_VERSION}.mk
 FETCH_BASE_MAKE	= $(shell gh api -H 'Accept: application/vnd.github.v3.raw' 'repos/elisasre/baseconfig/contents/go.mk?ref=${BASE_VERSION}' > ${BASE_MAKE})
 ifeq ($(wildcard ${BASE_MAKE}),)
diff --git a/go-40520c8.mk b/go-4411461.mk
similarity index 98%
rename from go-40520c8.mk
rename to go-4411461.mk
index b040ada..a599158 100644
--- a/go-40520c8.mk
+++ b/go-4411461.mk
@@ -3,18 +3,16 @@
 COMMA := ,
 SPACE := $(subst ,, )
 
-GO_VERSION	?= 1.20.5
+GO_VERSION	?= 1.20.6
 TOOLS_DIR	:= .tools
 GO 			:= ${TOOLS_DIR}/go/go${GO_VERSION}
 
 # If wanted version of Go isn't installed yet we use sane defaults.
 # This will allow us to trigger Go installation without error messages when these variables are evaluated.
 ifneq ($(wildcard ${GO}),)
-GO_BUILD_MATRIX		:= $(shell ${GO} tool dist list)
 SYS_GOOS			:= $(shell ${GO} env GOOS)
 SYS_GOARCH			:= $(shell ${GO} env GOARCH)
 else
-GO_BUILD_MATRIX		:= linux/amd64 linux/arm64 darwin/amd64 darwin/arm64
 ifeq ($(shell uname -s),Darwin)
 SYS_GOOS			:= darwin
 else
@@ -27,6 +25,7 @@ SYS_GOARCH			:= amd64
 endif
 endif
 
+GO_BUILD_MATRIX		:= linux/amd64 linux/arm64 darwin/amd64 darwin/arm64
 GO_BUILD_TARGETS	:= ${GO_BUILD_MATRIX:%=go-build/%}
 GOARCH				= $(notdir ${*})
 GOOS				= ${*:%/${GOARCH}=%}
@@ -34,7 +33,7 @@ BUILD_OUTPUT		= target/bin/${GOOS}/${GOARCH}/${APP_NAME}
 CONTAINER_PLATFORMS	:= linux/amd64 linux/arm64 darwin/amd64 darwin/arm64
 
 # Tools that can be installed with `go install` command.
-GOLANGCI_LINT_V		?= v1.53.2
+GOLANGCI_LINT_V		?= v1.53.3
 SWAG_V				?= v1.8.12
 GO_LICENSES_V		?= v1.6.0
 GOVULNCHECK_V		?= latest