This is an automated email from the ASF dual-hosted git repository.
fgerlits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new 3ec94eafb MINIFICPP-2812 Speed up rocky CI build (#2173)
3ec94eafb is described below
commit 3ec94eafb1770bb1aa88313fee691e0d48eedf6f
Author: Martin Zink <[email protected]>
AuthorDate: Mon May 11 16:19:43 2026 +0200
MINIFICPP-2812 Speed up rocky CI build (#2173)
---
docker/rockylinux/Dockerfile | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/docker/rockylinux/Dockerfile b/docker/rockylinux/Dockerfile
index d10a82aba..d60bf3e24 100644
--- a/docker/rockylinux/Dockerfile
+++ b/docker/rockylinux/Dockerfile
@@ -62,14 +62,10 @@ RUN cd $MINIFI_BASE_DIR && \
export PATH=/usr/lib64/ccache${PATH:+:${PATH}} && \
export CCACHE_DIR=${MINIFI_BASE_DIR}/.ccache && \
cmake -DSTATIC_BUILD= -DSKIP_TESTS=${DOCKER_SKIP_TESTS} ${MINIFI_OPTIONS}
-DAWS_ENABLE_UNITY_BUILD=OFF -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" .. && \
- make -j "$(nproc)" ${DOCKER_MAKE_TARGET}
-
-# Perform RPM build
-RUN if [[ "${DOCKER_CREATE_RPM}" == "ON" ]] ; then \
- cd $MINIFI_BASE_DIR && \
- cd build && \
- source /opt/rh/gcc-toolset-14/enable && \
+ make -j "$(nproc)" ${DOCKER_MAKE_TARGET} && \
+ if [[ "${DOCKER_CREATE_RPM}" == "ON" ]] ; then \
cmake -DMINIFI_PACKAGING_TYPE=RPM .. && \
- make -j "$(nproc)" package&& \
+ make -j "$(nproc)" package && \
../packaging/rpm/check_rpm_contents.sh *.rpm
expected-rpm-contents.txt; \
fi
+
