From 27ea4582c008083fc42d6e52da1dc3f6ff5cd25e Mon Sep 17 00:00:00 2001 From: Marcel Telka <marcel@telka.sk> Date: Mon, 08 Apr 2024 06:38:21 +0200 Subject: [PATCH] Switch default golang to 1.22 --- components/meta-packages/golang/manifests/sample-manifest.p5m | 2 +- components/meta-packages/golang/Makefile | 4 ++-- components/meta-packages/golang/pkg5 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/meta-packages/golang/Makefile b/components/meta-packages/golang/Makefile index ea5bdbb..c6befcb 100644 --- a/components/meta-packages/golang/Makefile +++ b/components/meta-packages/golang/Makefile @@ -17,7 +17,7 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME = golang -COMPONENT_VERSION = 1.21.1 +COMPONENT_VERSION = 1.22 COMPONENT_SUMMARY = The Go Programming Language COMPONENT_PROJECT_URL = https://go.dev/ COMPONENT_FMRI = developer/golang @@ -25,6 +25,6 @@ include $(WS_MAKE_RULES)/common.mk -PKG_MACROS += GOV=$(shell echo $(COMPONENT_VERSION) | $(GSED) -e 's/\(\.[^.]*\)\..*/\1/' | tr -d .) +PKG_MACROS += GOV=$(subst .,,$(COMPONENT_VERSION)) # Auto-generated dependencies diff --git a/components/meta-packages/golang/manifests/sample-manifest.p5m b/components/meta-packages/golang/manifests/sample-manifest.p5m index a9c0f76..862f329 100644 --- a/components/meta-packages/golang/manifests/sample-manifest.p5m +++ b/components/meta-packages/golang/manifests/sample-manifest.p5m @@ -10,7 +10,7 @@ # # -# Copyright 2023 <contributor> +# Copyright 2024 <contributor> # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) diff --git a/components/meta-packages/golang/pkg5 b/components/meta-packages/golang/pkg5 index 6a6f6ec..6ea6ee5 100644 --- a/components/meta-packages/golang/pkg5 +++ b/components/meta-packages/golang/pkg5 @@ -4,4 +4,4 @@ "developer/golang" ], "name": "golang" -} \ No newline at end of file +} -- Gitblit v1.9.3