From 3363c3725de4f2a74b4a7b5c11c2a5dad71e2675 Mon Sep 17 00:00:00 2001 From: samuel Date: Sat, 14 Feb 2026 21:54:24 +0100 Subject: [PATCH] ci: change git describe command --- .gitea/workflows/ci.yaml | 2 +- Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 8cbe3d6..bab9d62 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -16,6 +16,6 @@ jobs: - name: Build tarball run: make tarball - name: Build rpm package - run: rpmbuild -ba netoik-rp.spec + run: rpmbuild -ba "${make name}.spec" - name: Upload rpm package run: make upload diff --git a/Makefile b/Makefile index 80e7fdc..b654cce 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,8 @@ -NAME = $(shell basename $(PWD)) -VERSION = $(shell git describe | sed 's/-/./g') +NAME = netoik-rp +VERSION = $(shell git describe --tags --abbrev=0) RELEASE = $(shell git rev-parse --short HEAD) BRANCH = $(shell git branch --show-current) BUILD_ARCH = noarch -RPM_BUILD_PATH = $(RPM_RPMDIR)/$(BUILD_ARCH)/$(NAME)-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm RPM_RPMDIR = $(shell rpm --eval '%{_rpmdir}') RPM_SBINDIR = $(shell rpm --eval '%{_sbindir}') @@ -11,6 +10,7 @@ RPM_SOURCEDIR = $(shell rpm --eval '%{_sourcedir}') RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}') RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}') RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(NAME)-$(VERSION).tar.gz +RPM_BUILD_PATH = $(RPM_RPMDIR)/$(BUILD_ARCH)/$(NAME)-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm .PHONY: name name: