Skip to content

Commit 8914f9f

Browse files
Accept Homebrew revision suffix in LLVM version parsing (#557)
Homebrew published llvm 22.1.7_1, where the trailing _1 is a bottle revision (a rebuild of the same upstream version). The version validation regex only accepted bare X.Y.Z, so it rejected the _N suffix and failed the "Setup homebrew packages" step in every C++ job. Widen the regex to accept an optional _N revision suffix. The parsed value feeds compiler.abi_extra in the Conan sanitizers profile, so keeping the suffix is correct: a Homebrew rebuild should invalidate the Conan ABI discriminator and trigger a rebuild.
1 parent 63db812 commit 8914f9f

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

.github/actions/homebrew-packages-setup/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if [[ "${skipInstalls}" == "false" ]]; then
5050
exit 1
5151
fi
5252
llvmFullVersion=$(echo "${brewLlvmListOutput}" | awk '{print $NF}')
53-
if ! [[ "${llvmFullVersion}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
53+
if ! [[ "${llvmFullVersion}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(_[0-9]+)?$ ]]; then
5454
echo "::error::Could not parse LLVM full version from: ${brewLlvmListOutput}"
5555
exit 1
5656
fi

0 commit comments

Comments
 (0)