WS fix

Fast forward rawhide merge in branched branches
For pull_from_upstream to work we need this change in dist-git packit config.
2024-09-20 14:32:11 +02:00 · 2024-09-20 14:27:35 +02:00
2 changed files with 7 additions and 5 deletions
--- a/.packit.yaml
+++ b/.packit.yaml
@ -49,8 +49,9 @@ jobs:
    trigger: release
    # Use the stage instance once it works in downstream.
    dist_git_branches:
-      - fedora-all
-      - epel-9
+      rawhide:
+        fast_forward_merge_into: [fedora-branched]
+      epel-9: {}

  - job: sync_from_downstream
    trigger: commit
@ -104,8 +105,9 @@ jobs:
  - job: pull_from_upstream
    trigger: release
    dist_git_branches:
-      - fedora-all
-      - epel-9
+      rawhide:
+        fast_forward_merge_into: [fedora-branched]
+      epel-9: {}

  - job: koji_build
    trigger: commit | koji_build
--- a/packit.spec
+++ b/packit.spec
@ -36,7 +36,7 @@ Requires:       rpmdevtools
 # Copying files between repositories
 Requires:       rsync

-Recommends:       osh-cli
+Recommends:     osh-cli

 %description -n python3-packit
 Python library for Packit,
Author	SHA1	Message	Date
Nikola Forró	89ae015a53	WS fix	2024-09-20 14:32:11 +02:00
Maja Massarini	cc19c15050	Fast forward rawhide merge in branched branches For pull_from_upstream to work we need this change in dist-git packit config.	2024-09-20 14:27:35 +02:00