From 1ca25b2fbc553f9a2b004aa5d1b7c64928565fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 14 Sep 2023 21:34:36 +0200 Subject: [PATCH] Fix CI failure --- cmake.spec | 5 ++++- tests/cmake-testsuite-sanity/runtest.sh | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index eca6f2c..e224b60 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 7 +%global baserelease 8 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -559,6 +559,9 @@ popd %changelog +* Thu Sep 14 2023 Björn Esser - 3.27.4-8 +- Fix CI failure + * Thu Sep 14 2023 Björn Esser - 3.27.4-7 - Add upstream patches from milestone to cmake-3.27.5 diff --git a/tests/cmake-testsuite-sanity/runtest.sh b/tests/cmake-testsuite-sanity/runtest.sh index d76fdc0..24f249e 100755 --- a/tests/cmake-testsuite-sanity/runtest.sh +++ b/tests/cmake-testsuite-sanity/runtest.sh @@ -56,7 +56,8 @@ 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 "cd $TmpDir/BUILD/cmake*" + rlRun "CMakeDir=`ls $TmpDir/BUILD/cmake* | 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"