Skip to content

Commit bd103aa

Browse files
committed
ci: update llvm version
1 parent 2c2b4d6 commit bd103aa

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

.github/workflows/ci.yml

+9-11
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,21 @@ jobs:
7272
llvm_config_type="${{ matrix.build-type }}"
7373
if [ "${{ runner.os }}" == "Windows" ]; then
7474
llvm_runner_os="Windows"
75-
if [ "$llvm_config_type" == "Release" ]; then
76-
llvm_config_type="RelWithDebInfo"
77-
fi
75+
# if [ "$llvm_config_type" == "Release" ]; then
76+
# llvm_config_type="RelWithDebInfo"
77+
# fi
7878
llvm_archive_type="7z"
79+
llvm_config_type="Release"
7980
else
8081
llvm_runner_os="Linux"
8182
llvm_archive_type="tar.xz"
83+
llvm_config_type="Release"
8284
fi
83-
llvm_commit_id=731264b0
85+
llvm_commit_id=29b20829
8486
llvm_archive_filename="$llvm_runner_os-$llvm_config_type-$llvm_commit_id.$llvm_archive_type"
8587
llvm_url="https://github.com/cppalliance/mrdox/releases/download/llvm-package-release/$llvm_archive_filename"
8688
87-
release_url_exists=$(curl --head --silent --fail "$llvm_url")
88-
if [ -z "$release_url_exists" ]; then
89+
if ! curl --head --silent --fail "$llvm_url"; then
8990
llvm_url="https://mrdox.com/llvm+clang/$llvm_archive_filename"
9091
fi
9192
@@ -96,6 +97,7 @@ jobs:
9697
llvm_root="${{runner.tool_cache}}/llvm+clang"
9798
llvm_root=$(echo "$llvm_root" | sed 's/\\/\//g')
9899
mkdir -p "$llvm_root"
100+
99101
if [ "${{ runner.os }}" != "Windows" ]; then
100102
tar -xvf "$llvm_archive_filename" -C "$llvm_root" --strip-components=1
101103
else
@@ -104,12 +106,8 @@ jobs:
104106
mv * "$llvm_root"
105107
cd ..
106108
rm -rf "$llvm_config_type"
107-
108-
# Patch LLVMExports.cmake
109-
substring="C:/Program Files/Microsoft Visual Studio/2022/Community/DIA SDK/lib/amd64/diaguids.lib;"
110-
sed -i "s|$substring||g" "$llvm_root/lib/cmake/llvm/LLVMExports.cmake"
111109
fi
112-
110+
113111
# Export LLVM_ROOT
114112
echo "llvm_root=$llvm_root"
115113
echo -E "llvm-root=$llvm_root" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)