diff options
| author | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2024-11-08 13:55:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-08 13:55:13 +0100 |
| commit | 14aad851bc467baf89b5c181ac8ffcb4b42bb7bb (patch) | |
| tree | 546731cf4583d143a6a26962717fd6a46b544a09 | |
| parent | 9cd8294e99586fcbc4344b8e287886bd9788f969 (diff) | |
| parent | e5a825de740ce78d99a1f47118c76b756bf32554 (diff) | |
| download | monitoring-plugins-14aad851bc467baf89b5c181ac8ffcb4b42bb7bb.tar.gz | |
Merge pull request #2044 from RincewindsHat/fix/fedora-rpm-build
Fix RPM build tests
| -rwxr-xr-x | .github/mock.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/.github/mock.sh b/.github/mock.sh index 87543ce8..ea4f7f3d 100755 --- a/.github/mock.sh +++ b/.github/mock.sh | |||
| @@ -52,13 +52,16 @@ if command -v git > /dev/null 2>&1; then | |||
| 52 | fi | 52 | fi |
| 53 | 53 | ||
| 54 | mkdir -p "${SRCRPM_DIR}" "${RPM_DIR}" | 54 | mkdir -p "${SRCRPM_DIR}" "${RPM_DIR}" |
| 55 | #rpmbuild --undefine=_disable_source_fetch --define "_sourcedir ${SOURCE_DIR}" -ba ${SPEC_FILE} | 55 | |
| 56 | # Run mock below | ||
| 57 | # No idea what happens here to be honest | ||
| 58 | # mock seems to run more containers to build the package | ||
| 56 | dnf -y --setopt="tsflags=nodocs" install rpmdevtools && \ | 59 | dnf -y --setopt="tsflags=nodocs" install rpmdevtools && \ |
| 57 | spectool -g -C ${SOURCE_DIR} ${SPEC_FILE} && \ | 60 | spectool -g -C ${SOURCE_DIR} ${SPEC_FILE} && \ |
| 58 | { mock --dnf --clean --spec ${SPEC_FILE} --sources=${SOURCE_DIR} --result=${SRCRPM_DIR} --build || \ | 61 | mock --init && \ |
| 59 | { cat ${SRCRPM_DIR}/{root,build}.log; exit 1; } } | 62 | { mock --no-clean --spec ${SPEC_FILE} --sources=${SOURCE_DIR} --result=${SRCRPM_DIR} --build || \ |
| 60 | 63 | { cat ${SRCRPM_DIR}/{root,build}.log; exit 1; } } && \ | |
| 61 | mock --dnf --clean --sources=${SOURCE_DIR} --result=${RPM_DIR} --rebuild "${SRCRPM_DIR}"/${SRC_RPM} || \ | 64 | { mock --no-clean --sources=${SOURCE_DIR} --result=${RPM_DIR} --rebuild "${SRCRPM_DIR}"/${SRC_RPM} || \ |
| 62 | { cat ${RPM_DIR}/{root,build}.log; exit 1; } | 65 | { cat ${RPM_DIR}/{root,build}.log; exit 1; } } |
| 63 | 66 | ||
| 64 | ls -la ${SOURCE_DIR} ${SRCRPM_DIR} ${RPM_DIR} | 67 | ls -la ${SOURCE_DIR} ${SRCRPM_DIR} ${RPM_DIR} |