Skip to content

Commit b63e087

Browse files
committed
ci: Push the rpm-sequoia to the container before the build
1 parent 91d0137 commit b63e087

2 files changed

Lines changed: 20 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,16 @@ jobs:
136136
137137
echo "::group::make check"
138138
cd rpm
139-
# enable sha3 test in rpm testsuite
139+
# enable new test in rpm testsuite and patch dockerfile
140140
patch -p1 < ../tests/rpm.patch
141141
RPM_ROOT=$(pwd)
142+
# copy the rpm-sequoia artifacts to rpm directory
143+
mkdir sequoia
144+
cp ../target/debug/librpm_sequoia.so* sequoia/
142145
cd tests
143146
# based on ./mktree.oci build
144-
podman build --target full -t rpm-tests -f Dockerfile ..
145-
# install rpm-sequoia in the test image
146-
podman build -t rpm-tests-sequoia -f ../../tests/Dockerfile ../../
147-
# run the tests by overriding librpm-sequoia in the container.
147+
podman build --target full -t rpm-tests -f Dockerfile $RPM_ROOT
148+
# run the tests with new sequoia
148149
if ! podman run --privileged -it --rm --read-only --tmpfs /tmp -v $RPM_ROOT:/srv:z \
149150
--workdir /srv -e ROOTLESS=1 rpm-tests-sequoia \
150151
rpmtests -k OpenPGP -k signature -k rpmkeys -k digest;

tests/rpm.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,17 @@ index d0154aeec..ec224593d 100644
8080

8181
RPMTEST_CHECK([
8282
runroot rpmkeys --delete 036824f0ac60aed6f1a3256f88190469f6d7255e3d8e41c577233aa03e0bb9d3
83+
diff --git a/tests/Dockerfile.fedora b/tests/Dockerfile.fedora
84+
index 8fc61ba2b..423e80471 100644
85+
--- a/tests/Dockerfile.fedora
86+
+++ b/tests/Dockerfile.fedora
87+
@@ -82,6 +82,8 @@ FROM base AS full
88+
89+
WORKDIR /srv/rpm
90+
COPY . .
91+
+COPY /sequoia/librpm_sequoia.so /usr/local/lib64/
92+
+COPY /sequoia/librpm_sequoia.so.1 /usr/local/lib64/
93+
94+
WORKDIR /srv/build
95+
ENV CFLAGS="-Og -g"
96+

0 commit comments

Comments
 (0)