#546 Allow package.cfg on rawhide/main branch
Merged 4 days ago by onosek. Opened a month ago by sgallagh.
sgallagh/fedpkg package_cfg_rawhide  into  master

file modified
+1 -3
@@ -517,9 +517,7 @@ 

      # should be ok to remove if from this list.

      stream_branches = []

      for item in branches:

-         if item['name'] in ('rawhide', 'main'):

-             continue

-         elif re.match(r'^(f|el)\d+$', item['name']):

+         if re.match(r'^(f|el)\d+$', item['name']):

              continue

          # epel7 is regular release branch

          # epel8 and above should be considered a stream branch to use

Certain packages (such as fwupd and grub2) cannot be auto-rebuilt for
Fedora ELN due to signing requirements. They have to be built manually
by one of the short list of people that have the correct privilege. It's
easy to forget to build for both releases, so it would be ideal if we
could instead allow them to carry a package.cfg file on the Rawhide
branch that would result in fedpkg build building for both Rawhide and
ELN at the same time.

This patch leaves in place the check for release branches (f40, f39,
etc.) so that the presence of the package.cfg will not have an effect
once Rawhide is branched.

Signed-off-by: Stephen Gallagher sgallagh@redhat.com

I guess this is ok, provided the affected folks are ok with it. ;)

CC: @jforbes @pjones

Adding @rhughes and @nfrayer as maintainers of fwupd and grub2, respectively.

I'm okay with this for fwupd.

@kevin Can we get this merged and built? Do you want me to do it?

I was hoping we would find a existing maintainer willing to merge it.

If we don't have that, perhaps we should look at who could maintain these...

also, looks like jenkins had a failure there?

rebased onto 91cd748

9 days ago

Commit 0f87ee3 fixes this pull-request

Pull-Request has been merged by onosek

4 days ago

Hello,
sorry for the delay. I resolved the merge conflict.
The Jenkins pipeline passes.
https://jenkins-fedora-infra.apps.ocp.cloud.ci.centos.org/job/fedpkg-pipeline/230/console

Metadata