From 525b768da9ebcbb8030f78e2e45aeeed3a82506e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niko=20B=C3=B6ckerman?= Date: Tue, 9 Jun 2026 06:38:31 +0300 Subject: [PATCH] Accept Homebrew revision suffix in LLVM version parsing 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. --- .github/actions/homebrew-packages-setup/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/homebrew-packages-setup/install.sh b/.github/actions/homebrew-packages-setup/install.sh index 09e11610..27704ab8 100755 --- a/.github/actions/homebrew-packages-setup/install.sh +++ b/.github/actions/homebrew-packages-setup/install.sh @@ -50,7 +50,7 @@ if [[ "${skipInstalls}" == "false" ]]; then exit 1 fi llvmFullVersion=$(echo "${brewLlvmListOutput}" | awk '{print $NF}') - if ! [[ "${llvmFullVersion}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + if ! [[ "${llvmFullVersion}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(_[0-9]+)?$ ]]; then echo "::error::Could not parse LLVM full version from: ${brewLlvmListOutput}" exit 1 fi