Skip to content

Update GitHub action LLVM version to 17.0.5 #1373

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
jonwis merged 2 commits into from
Nov 26, 2023
Merged

Update GitHub action LLVM version to 17.0.5 #1373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e6405a
Maybe update tools version
jonwis Nov 25, 2023
18688c3
LLVM & Clang v17.0.5 now support source_location properly
jonwis Nov 25, 2023
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
2 changes: 1 addition & 1 deletion .github/actions/setup-llvm-msvc/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
llvm-version:
description: 'LLVM version'
required: true
default: '15.0.5'
default: '17.0.5'
outputs:
llvm-path:
description: "The path in which LLVM is installed to"
Expand Down
4 changes: 4 additions & 0 deletions Directory.Build.Props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
Optionally add /t:<project> to only build a given a solution project:

msbuild /m /p:Configuration=Debug,Platform=x64,Clang=1 cppwinrt.sln /t:cppwinrt

If you have deployed the LLVM toolset elsewhere, add its path to the configuration:

msbuild /m /p:Configuration=Debug,Platform=x64,Clang=1,LLVMToolsVersion=17.0.5,LLVMInstallDir=C:\llvm cppwinrt.sln
-->

<PropertyGroup Condition="'$(Clang)'=='1'">
Expand Down
7 changes: 1 addition & 6 deletions test/test_cpp20/custom_error.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,7 @@ namespace
}
}

#if defined(__clang__) && defined(_MSC_VER)
// FIXME: Blocked on __cpp_consteval, see:
// * https://github.com/microsoft/cppwinrt/pull/1203#issuecomment-1279764927
// * https://github.com/llvm/llvm-project/issues/57094
TEST_CASE("custom_error_logger", "[!shouldfail]")
#elif defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 160000
#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 170000
// <source_location> not available in libc++ before LLVM 16
TEST_CASE("custom_error_logger", "[!shouldfail]")
#else
Expand Down