Skip to content

Fix clang-format version to between v13 and v15 #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 8, 2024
Merged

Fix clang-format version to between v13 and v15 #953

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecb0ba9
[clang] in /tools/mg-clang-format/mg-clang-format, downgrade to clang…
valassi Aug 6, 2024
04aa15e
[clang] regenerate all processes on itscrd90, check that all is ok - …
valassi Aug 8, 2024
3e59de5
[clang] ** COMPLETE CLANG ** go back to upstream/master codegen logs
valassi Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions tools/mg-clang-format/mg-clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,24 @@ else
fi
###echo clangVersion=$clangVersion

if [ ${clangVersion} -ge 13 ]; then
if [ ${clangVersion} -ge 13 ] && [ ${clangVersion} -le 15 ]; then
exec clang-format "$@"
else
if [ ! -d /cvmfs/sft.cern.ch/lcg/releases/clang ]; then
echo "ERROR! clang-format version >= 13 is not installed and /cvmfs/sft.cern.ch/lcg/releases/clang is not reachable"
echo "ERROR! clang-format version >= 13 and <= 15 is not installed and /cvmfs/sft.cern.ch/lcg/releases/clang is not reachable"
exit 1
fi
redrel=$(cat /etc/redhat-release 2> /dev/null)
if [ "${redrel##*release 7}" != "${redrel}" ]; then
clangDir=/cvmfs/sft.cern.ch/lcg/releases/clang/13.0.1-721c8/x86_64-centos7
###clangDir=/cvmfs/sft.cern.ch/lcg/releases/clang/13.0.1-721c8/x86_64-centos7
clangDir=/cvmfs/sft.cern.ch/lcg/releases/clang/15.0.7-27d6b/x86_64-centos7
elif [ "${redrel##*release 8}" != "${redrel}" ]; then
clangDir=/cvmfs/sft.cern.ch/lcg/releases/clang/13.0.1-721c8/x86_64-centos8
elif [ "${redrel##*release 9}" != "${redrel}" ]; then
clangDir=/cvmfs/sft.cern.ch/lcg/releases/clang/14.0.6-14bdb/x86_64-centos9
###clangDir=/cvmfs/sft.cern.ch/lcg/releases/clang/14.0.6-14bdb/x86_64-centos9
clangDir=/cvmfs/sft.cern.ch/lcg/releases/clang/15.0.7-27d6b/x86_64-el9
else
echo "ERROR! clang-format version >= 13 is not installed and RedHat release could not be identified (${redrel})"
echo "ERROR! clang-format version >= 13 and <= 15 is not installed and RedHat release could not be identified (${redrel})"
exit 1
fi
source ${clangDir}/setup.sh
Expand Down