Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update basecommon to 4411461 #69

Merged
merged 1 commit into from
Jul 24, 2023
Merged

update basecommon to 4411461 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}),)
Expand Down
7 changes: 3 additions & 4 deletions go-40520c8.mk → go-4411461.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,14 +25,15 @@ 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}=%}
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
Expand Down