Skip to content
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

Jump to bottom

Switch build from createrepo-c to createrepo #3609

Merged
merged 1 commit into from
Jul 21, 2022
Merged

Switch build from createrepo-c to createrepo #3609

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
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
fi

- name: Installing build dependencies
run: apt-get update && apt-get install -y git make sed gzip fakeroot lintian dpkg-dev gpg createrepo-c
run: apt-get update && apt-get install -y git make sed gzip fakeroot lintian dpkg-dev gpg createrepo
- name: Installing runtime dependencies
run: apt-get install -y xvfb
- name: Install Docker
Expand Down
3 changes: 2 additions & 1 deletion rpm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ CHANGELOGSRC:=../CHANGELOG.md
VERSION:=$(shell egrep '^\s*\#\#\s+v.*$$' $(CHANGELOGSRC) | head -1 | sed -e 's/^\s*\#\#\s\+v//' -e 's/-/_/g' )
RPM:=$(TOPDIR)/RPMS/noarch/ckan-$(VERSION)-1.noarch.rpm

CREATEREPO:=$(if $(shell which createrepo),createrepo,createrepo_c)
REPODIR:=$(TOPDIR)/repo
CODENAME?=nightly
REPOFILE:=ckan_$(CODENAME).repo
Expand All @@ -38,7 +39,7 @@ $(REPOSIG): $(REPOXML)
gpg --detach-sign --armor $<

$(REPOXML): $(REPORPM)
createrepo_c "$(REPODIR)"
$(CREATEREPO) "$(REPODIR)"

$(REPORPM): $(RPM) $(REPOFILE)
mkdir -p "$(REPODIR)"
Expand Down