Skip to content

Commit d461389

Browse files
committed
Switch from rpm-gitoverlay to packit for building dnf-nightly
1 parent 0b587bb commit d461389

File tree

2 files changed

+24
-107
lines changed

2 files changed

+24
-107
lines changed

.github/workflows/nightly.yml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,21 @@ jobs:
1515
strategy:
1616
fail-fast: false # don't fail all matrix jobs if one of them fails
1717
matrix:
18-
project: [dnf-nightly]
19-
variant: ['', -sanitizers]
18+
project: [dnf-nightly, dnf-nightly-sanitizers]
19+
component: [drpm, createrepo_c, libsolv, libmodulemd, libpkgmanifest, librepo, libcomps, libdnf, dnf, dnf-plugins-core, dnf-plugins-extras, microdnf, dnf5]
20+
include:
21+
# Default url
22+
- url: https://github.com/rpm-software-management/
23+
# Override url for specific components
24+
- component: libmodulemd
25+
url: https://github.com/fedora-modularity/
26+
- component: libsolv
27+
url: https://github.com/openSUSE/
2028
steps:
2129
- name: Check out sources
2230
uses: actions/checkout@v4
2331

24-
- name: Setup CI
32+
- name: Setup Copr token
2533
id: setup-ci
2634
uses: ./.github/actions/setup-ci
2735
with:
@@ -32,4 +40,16 @@ jobs:
3240

3341
- name: Build in Copr
3442
if: steps.setup-ci.outputs.copr-user
35-
run: rpm-gitoverlay build-overlay -s overlays/${{matrix.project}} rpm copr --owner ${{steps.setup-ci.outputs.copr-user}} --project ${{matrix.project}}${{matrix.variant}}
43+
run: |
44+
# Since we don't control libsolv upstream work around missing packit initialization and specfile.
45+
if [[ "${{matrix.component}}" == "libsolv" ]]; then
46+
cat > packit_libsolv.yaml << EOL
47+
specfile_path: libsolv.spec
48+
actions:
49+
post-upstream-clone:
50+
- "wget https://src.fedoraproject.org/rpms/libsolv/raw/main/f/libsolv.spec -O libsolv.spec"
51+
EOL
52+
packit -c ./packit_libsolv.yaml build in-copr --owner ${{steps.setup-ci.outputs.copr-user}} --project ${{matrix.project}} ${{matrix.url}}${{matrix.component}}
53+
else
54+
packit build in-copr --owner ${{steps.setup-ci.outputs.copr-user}} --project ${{matrix.project}} ${{matrix.url}}${{matrix.component}}
55+
fi

overlays/dnf-nightly/overlay.yml

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)