From 4f35af80b6218e5887a4da261c0aed5a5a3b86da Mon Sep 17 00:00:00 2001 From: Dominika Hodovska Date: Tue, 3 Dec 2019 13:07:00 +0100 Subject: [PATCH 1/4] Enable copr builds and add packit config --- .packit.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..43ef2bf --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,14 @@ +downstream_package_name: edd +jobs: +- job: copr_build + metadata: + targets: + - fedora-30-x86_64 + - fedora-31-x86_64 + - fedora-rawhide-x86_64 + trigger: pull_request +specfile_path: edd.spec +synced_files: +- edd.spec +- .packit.yaml +upstream_package_name: edd From 8bd49832f23eb8c18ddef553d905a2abb09b5a50 Mon Sep 17 00:00:00 2001 From: Dominika Hodovska Date: Thu, 12 Dec 2019 14:14:44 +0100 Subject: [PATCH 2/4] Enable custom tarball in Packit to fix man page --- .packit.yaml | 19 ++++++++++++++----- Makefile | 8 ++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 43ef2bf..e6c1ac3 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,4 +1,18 @@ +specfile_path: edd.spec +synced_files: +- edd.spec +- .packit.yaml + downstream_package_name: edd +upstream_package_name: edd + +current_version_command: ["make", "packit-version"] + +actions: + create-archive: + - make packit-tarball + - make packit-path + jobs: - job: copr_build metadata: @@ -7,8 +21,3 @@ jobs: - fedora-31-x86_64 - fedora-rawhide-x86_64 trigger: pull_request -specfile_path: edd.spec -synced_files: -- edd.spec -- .packit.yaml -upstream_package_name: edd diff --git a/Makefile b/Makefile index abe2df5..def9187 100644 --- a/Makefile +++ b/Makefile @@ -47,5 +47,13 @@ push: packages $(TMP)/SOURCES/$(PACKAGE).tar.bz2 \ $(PUSH_URL)/download +# Packit stuff +packit-tarball: tarball + mv $(TMP)/SOURCES/$(PACKAGE).tar.bz2 . +packit-path: + @printf "$(PACKAGE).tar.bz2" +packit-version: + @printf "$(VERSION)" + clean: rm -rf $(TMP) From 3fc49c984735a2a962de4a1c593f5393626f9b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pl=C3=ADchal?= Date: Mon, 6 Jan 2020 13:11:06 +0100 Subject: [PATCH 3/4] Simplify packit's create-archive action --- .packit.yaml | 1 - Makefile | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index e6c1ac3..3676991 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -11,7 +11,6 @@ current_version_command: ["make", "packit-version"] actions: create-archive: - make packit-tarball - - make packit-path jobs: - job: copr_build diff --git a/Makefile b/Makefile index def9187..7fa499c 100644 --- a/Makefile +++ b/Makefile @@ -49,9 +49,7 @@ push: packages # Packit stuff packit-tarball: tarball - mv $(TMP)/SOURCES/$(PACKAGE).tar.bz2 . -packit-path: - @printf "$(PACKAGE).tar.bz2" + @printf "$(shell realpath $(TMP)/SOURCES/$(PACKAGE).tar.bz2)\n" packit-version: @printf "$(VERSION)" From e4dc0d06d66376b791fdfda10fecdbc0b83a06cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pl=C3=ADchal?= Date: Tue, 7 Jan 2020 12:53:28 +0100 Subject: [PATCH 4/4] Further simplify packit configuration --- .packit.yaml | 14 ++------------ Makefile | 7 +------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 3676991..91d6602 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,22 +1,12 @@ specfile_path: edd.spec -synced_files: -- edd.spec -- .packit.yaml - -downstream_package_name: edd -upstream_package_name: edd - -current_version_command: ["make", "packit-version"] actions: create-archive: - - make packit-tarball + - make tarball jobs: - job: copr_build metadata: targets: - - fedora-30-x86_64 - - fedora-31-x86_64 - - fedora-rawhide-x86_64 + - fedora-all trigger: pull_request diff --git a/Makefile b/Makefile index 7fa499c..36e4281 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ build: tarball: build cd $(TMP) && tar cfj SOURCES/$(PACKAGE).tar.bz2 $(PACKAGE) + @printf "$(shell realpath $(TMP)/SOURCES/$(PACKAGE).tar.bz2)\n" rpm: tarball rpmbuild --define '_topdir $(TMP)' -bb edd.spec @@ -47,11 +48,5 @@ push: packages $(TMP)/SOURCES/$(PACKAGE).tar.bz2 \ $(PUSH_URL)/download -# Packit stuff -packit-tarball: tarball - @printf "$(shell realpath $(TMP)/SOURCES/$(PACKAGE).tar.bz2)\n" -packit-version: - @printf "$(VERSION)" - clean: rm -rf $(TMP)