From 697f66f11115388927e40888114107ae847fbb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 20 Sep 2024 14:32:11 +0200 Subject: [PATCH 1/2] WS fix --- packit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packit.spec b/packit.spec index e62fbb5..5107012 100644 --- 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, From c60dbc57bf854af1eeec2cfdd84b6a46c97081f0 Mon Sep 17 00:00:00 2001 From: Maja Massarini Date: Wed, 18 Sep 2024 14:38:45 +0200 Subject: [PATCH 2/2] Fast forward rawhide merge in branched branches For pull_from_upstream to work we need this change in dist-git packit config. --- .packit.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 9578c9a..06fd322 100644 --- 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