From e443bffe5a45d807c3ec0bd078bda60461bc30bc Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 24 Apr 2025 16:17:22 +0530 Subject: [PATCH 1/2] [skip-ci] Packit: re-enable fedora-41 targets Signed-off-by: Lokesh Mandvekar --- .packit.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.packit.yaml b/.packit.yaml index c198fab1dc..b708a76b7d 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -36,6 +36,8 @@ jobs: - fedora-latest-stable-aarch64 - fedora-development-x86_64 - fedora-development-aarch64 + - fedora-41-x86_64 + - fedora-41-aarch64 # Ignore until golang is updated in distro buildroot to go 1.23.3+ - job: copr_build From 9b751a27b9734002fe824b36d7d8f9a98a935776 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 24 Apr 2025 16:34:14 +0530 Subject: [PATCH 2/2] [skip-ci] Packit: do not merge PR in CI Packit's default behaviour of merging commits on PR copr build jobs ends up creating a HEAD commit ID that doesn't exist upstream. This commit disables that behaviour. This way, copr builds from release PR can be used for podman-machine-os builds. Co-authored-by: Matej Focko Signed-off-by: Lokesh Mandvekar --- .packit.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.packit.yaml b/.packit.yaml index b708a76b7d..b4170f5925 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -15,6 +15,9 @@ packages: podman-eln: specfile_path: rpm/podman.spec +# Disable automatic merging for Copr builds (and subsequent Testing Farm) +merge_pr_in_ci: false + srpm_build_deps: - git-archive-all - make