From 2197ff8aa08f34496ca4e1a52cf1380494e11bc0 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 24 Apr 2026 21:19:00 +0400 Subject: [PATCH] feat: sync pkgs/tools Update to 1.13.0. Signed-off-by: Andrey Smirnov --- .kres.yaml | 4 ++-- Makefile | 31 ++++++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.kres.yaml b/.kres.yaml index bb3948c..434db42 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -100,11 +100,11 @@ spec: - name: EXTENSIONS_IMAGE_REF defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG) - name: PKGS - defaultValue: v1.13.0-beta.0-14-gb121566 + defaultValue: v1.13.0 - name: PKGS_PREFIX defaultValue: ghcr.io/siderolabs - name: TOOLS - defaultValue: v1.13.0-beta.0-3-gc192d81 + defaultValue: v1.13.0 - name: TOOLS_PREFIX defaultValue: ghcr.io/siderolabs - name: GO_TOOLS_RELEASE diff --git a/Makefile b/Makefile index 30793f3..efe5136 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,19 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2026-04-15T13:04:50Z by kres b6d29bf. +# Generated on 2026-04-24T17:18:49Z by kres f51cb9c. # common variables SHA := $(shell git describe --match=none --always --abbrev=8 --dirty) -TAG := $(shell git describe --tag --always --dirty --match v[0-9]\*) +TAG ?= $(shell git describe --tag --always --dirty --match v[0-9]\*) TAG_SUFFIX ?= -ABBREV_TAG := $(shell git describe --tags >/dev/null 2>/dev/null && git describe --tag --always --match v[0-9]\* --abbrev=0 || echo 'undefined') +ABBREV_TAG ?= $(shell git describe --tags >/dev/null 2>/dev/null && git describe --tag --always --match v[0-9]\* --abbrev=0 || echo 'undefined') BRANCH := $(shell git rev-parse --abbrev-ref HEAD) ARTIFACTS := _out IMAGE_TAG ?= $(TAG)$(TAG_SUFFIX) OPERATING_SYSTEM := $(shell uname -s | tr '[:upper:]' '[:lower:]') GOARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/') +CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 -- 2>/dev/null | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$$/\\1/; t; Q") REGISTRY ?= ghcr.io USERNAME ?= siderolabs REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME) @@ -54,9 +55,9 @@ COMMON_ARGS += $(BUILD_ARGS) # extra variables EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG) -PKGS ?= v1.13.0-beta.0-14-gb121566 +PKGS ?= v1.13.0 PKGS_PREFIX ?= ghcr.io/siderolabs -TOOLS ?= v1.13.0-beta.0-3-gc192d81 +TOOLS ?= v1.13.0 TOOLS_PREFIX ?= ghcr.io/siderolabs GO_TOOLS_RELEASE ?= v0.3.1 @@ -209,6 +210,14 @@ $(ARTIFACTS): ## Creates artifacts directory. clean: ## Cleans up all artifacts. @rm -rf $(ARTIFACTS) +.PHONY: ci-temp-release-tag +ci-temp-release-tag: ## Generates a temporary release tag for CI run. + @if [ -n "$(CI_RELEASE_TAG)" -a -n "$${GITHUB_ENV}" ]; then \ + echo Setting temporary release tag "$(CI_RELEASE_TAG)"; \ + echo "TAG=$(CI_RELEASE_TAG)" >> "$${GITHUB_ENV}"; \ + echo "ABBREV_TAG=$(CI_RELEASE_TAG)" >> "$${GITHUB_ENV}"; \ + fi + target-%: ## Builds the specified target defined in the Pkgfile. The build result will only remain in the build cache. @$(BUILD) --target=$* $(COMMON_ARGS) $(TARGET_ARGS) $(CI_ARGS) . @@ -325,3 +334,15 @@ conformance: @docker pull $(CONFORMANCE_IMAGE) @docker run --rm -it -v $(PWD):/src -w /src $(CONFORMANCE_IMAGE) enforce +.PHONY: renovate-local +renovate-local: ## runs renovate locally to check syntax and test configuration + @docker run --rm \ + --user $(shell id -u):$(shell id -g) \ + -v $(PWD):/src \ + -w /src \ + -e GITHUB_TOKEN \ + -e LOG_LEVEL=debug \ + -e RENOVATE_PLATFORM=local \ + -e RENOVATE_DRY_RUN=full \ + renovate/renovate +