From e3ad0b0e2e56444c42a2e930a3848beb78aa9ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 15 Sep 2023 12:35:38 +0200 Subject: [PATCH] Fix CI failure finally --- cmake.spec | 5 ++++- tests/cmake-testsuite-sanity/runtest.sh | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index e224b60..f84e042 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 8 +%global baserelease 9 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -559,6 +559,9 @@ popd %changelog +* Fri Sep 15 2023 Björn Esser - 3.27.4-9 +- Fix CI failure finally + * Thu Sep 14 2023 Björn Esser - 3.27.4-8 - Fix CI failure diff --git a/tests/cmake-testsuite-sanity/runtest.sh b/tests/cmake-testsuite-sanity/runtest.sh index cb00549..53d612d 100755 --- a/tests/cmake-testsuite-sanity/runtest.sh +++ b/tests/cmake-testsuite-sanity/runtest.sh @@ -56,11 +56,11 @@ rlJournalStart rlRun "dnf builddep -y $TmpDir/SPECS/*.spec" rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/rpmbuild.log" - rlRun "CMakeDir=`ls $TmpDir/BUILD | grep -E 'cmake-[0-9]+\.[0-9]+\.[0-9]+' | tail -n 1`" + rlRun "CMakeDir=`ls $TmpDir/BUILD | grep -E '^cmake-[0-9]+\.[0-9]+\.[0-9]+$' | tail -n 1`" rlRun "cd $TmpDir/BUILD/$CMakeDir" rlRun "su -c './bootstrap &>$TmpDir/bootstrap.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/bootstrap.log" - rlRun "ln -s /usr/bin/cmake bin/cmake" + rlRun "ln -fs /usr/bin/cmake bin/cmake" rlPhaseEnd rlPhaseStartTest "run testsuite"