Merge pull request #32869 from keszybz/dbus-release-session

[thirdparty/systemd.git] / .packit.yml

diff --git a/.packit.yml b/.packit.yml
index 61b82d6341cefb5b63a6d528d4b5f5d2d4d3b52c..2dcc9e86ca448483d84bf1f80ea160bd8a569802 100644 (file)
--- a/.packit.yml
+++ b/.packit.yml
@@ -4,8 +4,8 @@
 # Docs: https://packit.dev/docs/
 
 specfile_path: .packit_rpm/systemd.spec
-synced_files:
-  - .packit.yaml
+files_to_sync:
+  - .packit.yml
   - src: .packit_rpm/systemd.spec
     dest: systemd.spec
 upstream_package_name: systemd
@@ -16,6 +16,13 @@ upstream_tag_template: "v{version}"
 srpm_build_deps: []
 
 actions:
+  get-current-version:
+    # Show the closest matching tag for the checked out revision, otherwise
+    # Packit tries to get the latest tag by creation date, which doesn't work
+    # well in the systemd-stable repo. We also need to sanitize it manually
+    # since "upstream_tag_template" defined above doesn't apply here.
+    - "bash -ec 'git describe --tags --abbrev=0 | cut -b 2-'"
+
   post-upstream-clone:
     # Use the Fedora Rawhide specfile
     - "git clone https://src.fedoraproject.org/rpms/systemd .packit_rpm --depth=1"
@@ -32,16 +39,26 @@ actions:
     # [0] https://github.com/mesonbuild/meson/issues/7360
     # [1] https://github.com/systemd/systemd/pull/18908#issuecomment-792250110
     - 'sed -i "/^CONFIGURE_OPTS=(/a--werror" .packit_rpm/systemd.spec'
-    # Ignore unpackages standalone binaries
+    # Ignore unpackaged standalone binaries
     - "sed -i 's/assert False,.*/pass/' .packit_rpm/split-files.py"
+    # Temporarily add libarchive-devel build dep and libarchive runtime dep
+    # until the change propagates to Rawhide's specfile
+    - "sed -ri '0,/^BuildRequires: .+$/s//&\\nBuildRequires: libarchive-devel\\nRequires: libarchive/' .packit_rpm/systemd.spec"
 
 jobs:
 - job: copr_build
   trigger: pull_request
-  metadata:
-    targets:
-    - fedora-rawhide-aarch64
-    - fedora-rawhide-i386
-    - fedora-rawhide-ppc64le
-    - fedora-rawhide-s390x
-    - fedora-rawhide-x86_64
+  targets:
+  - fedora-rawhide-aarch64
+  - fedora-rawhide-i386
+  - fedora-rawhide-ppc64le
+  - fedora-rawhide-s390x
+  - fedora-rawhide-x86_64
+
+- job: tests
+  trigger: pull_request
+  fmf_url: https://src.fedoraproject.org/tests/systemd
+  fmf_ref: main
+  tmt_plan: ci
+  targets:
+  - fedora-rawhide-x86_64