Skip to content

Fix COPR build failure induced by git tag finder #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vhrabar merged 1 commit into from
Aug 19, 2026
Merged

Fix COPR build failure induced by git tag finder #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions .copr/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
VERSION := $(shell git describe --tags --abbrev=0 2>/dev/null | sed 's/^v//; s/-/~/g' | grep .)
SPEC := secureEye/rpm/secure-eye.spec
outdir ?= $(CURDIR)
topdir := $(CURDIR)/.copr-rpmbuild
Expand All @@ -7,15 +6,22 @@ topdir := $(CURDIR)/.copr-rpmbuild
srpm:
dnf -y install git rpm-build
git config --global --add safe.directory $(CURDIR)
scripts/set-package-version.sh "$(VERSION)"
set -eu; \
version="$$(git describe --tags --abbrev=0 2>/dev/null | sed 's/^v//; s/-/~/g')"; \
if [ -z "$$version" ]; then \
echo "no tag to take the version from: submit the build with --commit <tag> so the clone is checked out at a tagged commit" >&2; \
exit 1; \
fi; \
echo "building secure-eye $$version"; \
scripts/set-package-version.sh "$$version"; \
git -c user.name=copr -c user.email=copr@localhost \
commit -qam "generated packaging for $(VERSION)" --allow-empty
mkdir -p "$(topdir)/SOURCES" "$(outdir)"
commit -qam "generated packaging for $$version" --allow-empty; \
mkdir -p "$(topdir)/SOURCES" "$(outdir)"; \
git archive --format=tar.gz \
--prefix="secure-eye-$(VERSION)/" \
-o "$(topdir)/SOURCES/secure-eye-$(VERSION).tar.gz" HEAD
cp secureEye/rpm/secure-eye.sysusers "$(topdir)/SOURCES/"
--prefix="secure-eye-$$version/" \
-o "$(topdir)/SOURCES/secure-eye-$$version.tar.gz" HEAD; \
cp secureEye/rpm/secure-eye.sysusers "$(topdir)/SOURCES/"; \
rpmbuild -bs $(SPEC) \
--define "_topdir $(topdir)" \
--define "pkg_version $(VERSION)" \
--define "pkg_version $$version" \
--define "_srcrpmdir $(outdir)"
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.2.1] - 2026-08-19

### Fixed

- COPR builds failed in the source stage, before any chroot was built:
`.copr/Makefile` resolved the release version with `git describe` while make
parsed the file, which happens before the recipe installs git. The version
came out empty and `set-package-version.sh` aborted. It is now resolved
inside the recipe, after git is installed, and a clone with no reachable tag
fails with a message that says so rather than with a blank version.

## [0.2.0] - 2026-08-18

### Changed
Expand Down
Loading