Skip to content

Commit cee472d

Browse files
committed
ci: use generated and configured libmodulemd-ci repo
Don't specify package paths directly.
1 parent 201d877 commit cee472d

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

.ci/fedora/ci-tasks.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,17 @@ createrepo_c $arch
7070
$RETRY_CMD dnf -y install --nogpgcheck \
7171
--allowerasing \
7272
--repofrompath libmodulemd-ci,$arch \
73-
$arch/python3-libmodulemd*.rpm \
74-
$arch/libmodulemd-devel*.rpm
73+
--repo libmodulemd-ci \
74+
python3-libmodulemd \
75+
libmodulemd-devel
7576

7677
# Also install the python2-libmodulemd if it was built for this release
7778
# the ||: at the end instructs bash to consider this a pass either way.
7879
dnf -y install --nogpgcheck \
7980
--allowerasing \
8081
--repofrompath libmodulemd-ci,$arch \
81-
$arch/python2-libmodulemd*.rpm ||:
82+
--repo libmodulemd-ci \
83+
python2-libmodulemd ||:
8284
popd #build_rpm
8385

8486
meson --buildtype=release \

.github/workflows/ci.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,9 @@ jobs:
102102
dnf -y install --nogpgcheck
103103
--allowerasing
104104
--repofrompath libmodulemd-ci,x86_64
105-
x86_64/python3-libmodulemd*.rpm
106-
x86_64/libmodulemd-devel*.rpm
105+
--repo libmodulemd-ci
106+
python3-libmodulemd
107+
libmodulemd-devel
107108

108109
- name: Set up the build directory
109110
run:
@@ -207,8 +208,9 @@ jobs:
207208
dnf -y install --nogpgcheck
208209
--allowerasing
209210
--repofrompath libmodulemd-ci,x86_64
210-
x86_64/python3-libmodulemd*.rpm
211-
x86_64/libmodulemd-devel*.rpm
211+
--repo libmodulemd-ci
212+
python3-libmodulemd
213+
libmodulemd-devel
212214

213215
- name: Set up the build directory
214216
run:

0 commit comments

Comments
 (0)