From 3832e55be0020d2ba64ea964faa384b62367097a Mon Sep 17 00:00:00 2001 From: weizhoublue Date: Wed, 25 Dec 2024 20:00:38 +0800 Subject: [PATCH] github Signed-off-by: weizhoublue --- Makefile | 7 +++---- go.mod | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b9712e13..a5882612 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ lint_chart_version: GO_VERSION := $(shell cat GO_VERSION | tr -d '\n' ) GO_IMAGE_VERSION = $(shell echo ${GO_VERSION} | awk -F. '{ z=$$3; if (z == "") z=0; print $$1 "." $$2 "." z}' ) -GO_MAJOR_AND_MINOR_VERSION = $(shell echo "${GO_VERSION}" | grep -o -E '^[0-9]+\.[0-9]+' ) +#GO_MAJOR_AND_MINOR_VERSION = $(shell echo "${GO_VERSION}" | grep -o -E '^[0-9]+\.[0-9]+' ) ## Update Go version for all the components @@ -102,12 +102,11 @@ update_workflow_golang: sed -i 's/go-version: .*/go-version: '${GO_IMAGE_VERSION}'/g' $$fl ; \ done - # Update Go version in go.mod .PHONY: update_mod_golang update_mod_golang: - echo "update go.mod to ${GO_MAJOR_AND_MINOR_VERSION}" ; \ - sed -i -E 's/^go .*/go '"${GO_MAJOR_AND_MINOR_VERSION}"'/g' go.mod + echo "update go.mod to ${GO_VERSION}" ; \ + sed -i -E 's/^go .*/go '"${GO_VERSION}"'/g' go.mod #------------------------------------------- diff --git a/go.mod b/go.mod index 8a2998a9..219beb7d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/spidernet-io/bmc -go 1.23 +go 1.23.0 toolchain go1.23.4