chore: fix the Makefile

Fix the error when not on a release.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
This commit is contained in:
Andrey Smirnov 2024-07-08 15:50:55 +04:00
parent 48cdbe0de7
commit c9aeeca3d4
No known key found for this signature in database
GPG Key ID: FE042E3D4085A811
3 changed files with 4 additions and 3 deletions

View File

@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
# #
# Generated on 2024-07-05T14:53:41Z by kres 8c8b007. # Generated on 2024-07-08T11:54:59Z by kres 8c8b007.
name: default name: default
concurrency: concurrency:
@ -3038,7 +3038,7 @@ jobs:
runs-on: runs-on:
- self-hosted - self-hosted
- talos - talos
if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/')) && github.event_name != 'pull_request' if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/')) && github.event_name != 'pull_request' && !startsWith(github.ref, 'refs/tags/')
steps: steps:
- name: gather-system-info - name: gather-system-info
id: system-info id: system-info

View File

@ -136,6 +136,7 @@ spec:
- talos - talos
conditions: conditions:
- except-pull-request - except-pull-request
- not-on-tag
steps: steps:
- name: build - name: build
command: talosctl-all kernel sd-boot sd-stub initramfs installer imager talos command: talosctl-all kernel sd-boot sd-stub initramfs installer imager talos

View File

@ -14,7 +14,7 @@ NAME = Talos
CLOUD_IMAGES_EXTRA_ARGS ?= "" CLOUD_IMAGES_EXTRA_ARGS ?= ""
ZSTD_COMPRESSION_LEVEL ?= 18 ZSTD_COMPRESSION_LEVEL ?= 18
CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$$/\\1/; t; Q") CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 -- HEAD^2 | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$$/\\1/; t; Q")
ARTIFACTS := _out ARTIFACTS := _out
TOOLS ?= ghcr.io/siderolabs/tools:v1.8.0-alpha.0-6-g31ad71b TOOLS ?= ghcr.io/siderolabs/tools:v1.8.0-alpha.0-6-g31ad71b