diff --git a/.copr/Makefile b/.copr/Makefile deleted file mode 100644 index 8e3b1e9f..00000000 --- a/.copr/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# This Makefile is part of a continuous development workflow integration with -# Fedora's COPR build service (https://copr.fedorainfracloud.org). In order to -# build an RPM in COPR's infrastructure, this Makefile exists to build a -# SRPM. See https://docs.pagure.org/copr.copr/user_documentation.html#scm for -# details on how this Makefile is expected to behave. -# -# N.B.: This Makefile should not be used to build an SRPM manually. Instead, -# see 'dist/srpm' on how to use meson to build an SRPM manually. - -.PHONY: help -help: - @echo "This Makefile is not intended to be run manually." - @echo "Run 'meson compile srpm' instead." - -.PHONY: srpm -srpm: - dnf install --assumeyes bash-completion git-core go meson 'pkgconfig(dbus-1)' 'pkgconfig(systemd)' rpm-build - meson setup builddir -Dbuild_srpm=True -Dvendor=True -Dexamples=True - meson compile srpm -C builddir - mv builddir/dist/srpm/*.src.rpm $(outdir) diff --git a/.packit.yaml b/.packit.yaml index 4dd4c5c6..5fa3199a 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,12 +1,13 @@ upstream_package_name: yggdrasil downstream_package_name: yggdrasil -specfile_path: out/yggdrasil.spec +specfile_path: builddir/dist/srpm/yggdrasil.spec srpm_build_deps: - bash-completion - gawk - git-core - golang + - go-rpm-macros - meson - 'pkgconfig(dbus-1)' - 'pkgconfig(systemd)' @@ -14,16 +15,12 @@ srpm_build_deps: actions: post-upstream-clone: - - mkdir out - - meson setup builddir -Dbuild_srpm=True -Dvendor=True -Dexamples=True - - meson compile srpm -C builddir - - bash -c 'mv builddir/dist/srpm/* out/' + - meson setup builddir -Dbuild_srpm=True -Dvendor=True -Dexamples=True --wipe + - meson compile tarball -C builddir get-current-version: - - awk '/^Version:/ {print $2;}' out/yggdrasil.spec + - awk '/^Version:/ {print $2;}' builddir/dist/srpm/yggdrasil.spec create-archive: - - bash -c 'echo out/yggdrasil-*.tar.*' - fix-spec-file: - - echo 'nothing to fix' + - bash -c 'echo builddir/dist/srpm/yggdrasil-*.tar.*' jobs: - job: copr_build @@ -36,3 +33,8 @@ jobs: - fedora-all - rhel-8 - rhel-9 + - job: copr_build + trigger: commit + branch: main + owner: "@yggdrasil" + project: latest