Skip to content

Commit 7cc3b84

Browse files
committed
Fix wix version
1 parent c548be8 commit 7cc3b84

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

.github/workflows/release-binaries.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,17 @@ jobs:
178178
target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_ENABLE_LTO=OFF"
179179
# libxml2 config
180180
target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_CMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DBOOTSTRAP_BOOTSTRAP_CMAKE_FIND_PACKAGE_PREFER_CONFIG=ON"
181-
fi
181+
182+
# We are using the Wix generator which doesn't support strings in
183+
# the version, so strip out the git suffix and replace the -rc3 suffix
184+
# with .3.
185+
rc_version=`grep -o 'LLVM_VERSION_SUFFIX -rc[0-9]' cmake/Modules/LLVMVersion.cmake | cut -d ' ' -f 2 | sed 's/-rc//g'`
186+
if [ -z "$rc_version" ]; then
187+
version_suffix=""
188+
else
189+
version_suffix=".$rc_version"
190+
fi
191+
target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_BOOTSTRAP_LLVM_VERSION_SUFFIX=$version_suffix"
182192
183193
echo "target-cmake-flags=$target_cmake_flags" >> $GITHUB_OUTPUT
184194
case "${{ inputs.runs-on }}" in

0 commit comments

Comments
 (0)