Merge pull request #7070 from thornbill/fix-ci-builds

pull/7075/head
Joshua M. Boniface 3 years ago committed by GitHub
commit dc9e1ece29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -3,9 +3,8 @@ INSTGIT := $(shell if [ "$$(id -u)" = "0" ]; then dnf -y install git; fi)
NAME := jellyfin-server NAME := jellyfin-server
VERSION := $(shell sed -ne '/^Version:/s/.* *//p' $(DIR)/jellyfin.spec) VERSION := $(shell sed -ne '/^Version:/s/.* *//p' $(DIR)/jellyfin.spec)
RELEASE := $(shell sed -ne '/^Release:/s/.* *\(.*\)%{.*}.*/\1/p' $(DIR)/jellyfin.spec) RELEASE := $(shell sed -ne '/^Release:/s/.* *\(.*\)%{.*}.*/\1/p' $(DIR)/jellyfin.spec)
GIT_VER := $(shell git describe --tags | sed -e 's/^v//' -e 's/-[0-9]*-g.*$$//') SRPM := jellyfin-$(subst -,~,$(VERSION))-$(RELEASE)$(shell rpm --eval %dist).src.rpm
SRPM := jellyfin-$(subst -,~,$(GIT_VER))-$(RELEASE)$(shell rpm --eval %dist).src.rpm TARBALL :=$(NAME)-$(subst -,~,$(VERSION)).tar.gz
TARBALL :=$(NAME)-$(subst -,~,$(GIT_VER)).tar.gz
epel-7-x86_64_repos := https://packages.microsoft.com/rhel/7/prod/ epel-7-x86_64_repos := https://packages.microsoft.com/rhel/7/prod/
epel-8-x86_64_repos := https://download.copr.fedorainfracloud.org/results/@dotnet-sig/dotnet-preview/$(TARGET)/ epel-8-x86_64_repos := https://download.copr.fedorainfracloud.org/results/@dotnet-sig/dotnet-preview/$(TARGET)/
@ -24,9 +23,9 @@ $(DIR)/$(TARBALL):
cd $(DIR)/; \ cd $(DIR)/; \
SOURCE_DIR=.. \ SOURCE_DIR=.. \
WORKDIR="$${PWD}"; \ WORKDIR="$${PWD}"; \
version=$(GIT_VER); \ version=$(VERSION); \
tar \ tar \
--transform "s,^\.,$(NAME)-$(subst -,~,$(GIT_VER))," \ --transform "s,^\.,$(NAME)-$(subst -,~,$(VERSION))," \
--exclude='.git*' \ --exclude='.git*' \
--exclude='**/.git' \ --exclude='**/.git' \
--exclude='**/.hg' \ --exclude='**/.hg' \
@ -43,7 +42,6 @@ $(DIR)/$(TARBALL):
-C $${SOURCE_DIR} ./ -C $${SOURCE_DIR} ./
$(DIR)/$(SRPM): $(DIR)/$(TARBALL) $(DIR)/jellyfin.spec $(DIR)/$(SRPM): $(DIR)/$(TARBALL) $(DIR)/jellyfin.spec
./bump_version $(GIT_VER)
cd $(DIR)/; \ cd $(DIR)/; \
rpmbuild -bs jellyfin.spec \ rpmbuild -bs jellyfin.spec \
--define "_sourcedir $$PWD/" \ --define "_sourcedir $$PWD/" \

Loading…
Cancel
Save