rpms
/
cmake
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix CI failure finally

This commit is contained in:
Björn Esser 2023-09-15 12:35:38 +02:00
parent b105e87742
commit e3ad0b0e2e
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake.spec
View File

@ -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 <besser82@fedoraproject.org> - 3.27.4-9
- Fix CI failure finally
* Thu Sep 14 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.4-8
- Fix CI failure

4
tests/cmake-testsuite-sanity/runtest.sh
View File

@ -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"