samuel/netoik-rp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: change git describe command

Browse Source
This commit is contained in:
samuel
2026-02-14 21:54:24 +01:00
parent 69d5b8aeae
commit 3363c3725d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/ci.yaml
View File

@@ -16,6 +16,6 @@ jobs:
- name: Build tarball - name: Build tarball
run: make tarball run: make tarball
- name: Build rpm package - name: Build rpm package
run: rpmbuild -ba netoik-rp.spec run: rpmbuild -ba "${make name}.spec"
- name: Upload rpm package - name: Upload rpm package
run: make upload run: make upload

6
Makefile
View File

@@ -1,9 +1,8 @@
NAME = $(shell basename $(PWD)) NAME = netoik-rp
VERSION = $(shell git describe | sed 's/-/./g') VERSION = $(shell git describe --tags --abbrev=0)
RELEASE = $(shell git rev-parse --short HEAD) RELEASE = $(shell git rev-parse --short HEAD)
BRANCH = $(shell git branch --show-current) BRANCH = $(shell git branch --show-current)
BUILD_ARCH = noarch BUILD_ARCH = noarch
RPM_BUILD_PATH = $(RPM_RPMDIR)/$(BUILD_ARCH)/$(NAME)-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm
RPM_RPMDIR = $(shell rpm --eval '%{_rpmdir}') RPM_RPMDIR = $(shell rpm --eval '%{_rpmdir}')
RPM_SBINDIR = $(shell rpm --eval '%{_sbindir}') RPM_SBINDIR = $(shell rpm --eval '%{_sbindir}')
@@ -11,6 +10,7 @@ RPM_SOURCEDIR = $(shell rpm --eval '%{_sourcedir}')
RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}') RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}')
RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}') RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}')
RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(NAME)-$(VERSION).tar.gz RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
RPM_BUILD_PATH = $(RPM_RPMDIR)/$(BUILD_ARCH)/$(NAME)-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm
.PHONY: name .PHONY: name
name: name: