Skip to content

release/20.x: [libc++][ci] Update the Windows toolchains to Clang 19 (#129232) #129303

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.

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
merged 1 commit into from
Mar 11, 2025

Conversation

llvmbot
Copy link
Member

@llvmbot llvmbot commented Feb 28, 2025

Backport e6a0ee3

Requested by: @mstorsjo

@llvmbot
Copy link
Member Author

llvmbot commented Feb 28, 2025

@frederick-vs-ja What do you think about merging this PR to the release branch?

@github-project-automation github-project-automation bot moved this to Needs Triage in LLVM Release Status Feb 28, 2025
@llvmbot llvmbot added libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. github:workflow labels Feb 28, 2025
@llvmbot
Copy link
Member Author

llvmbot commented Feb 28, 2025

@llvm/pr-subscribers-github-workflow

@llvm/pr-subscribers-libcxx

Author: None (llvmbot)

Changes

Backport e6a0ee3

Requested by: @mstorsjo


Full diff: https://github.com/llvm/llvm-project/pull/129303.diff

1 Files Affected:

  • (modified) .github/workflows/libcxx-build-and-test.yaml (+2-2)
diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml
index ee77e83363d37..3346c1322a07c 100644
--- a/.github/workflows/libcxx-build-and-test.yaml
+++ b/.github/workflows/libcxx-build-and-test.yaml
@@ -251,11 +251,11 @@ jobs:
       - name: Install a current LLVM
         if: ${{ matrix.mingw != true }}
         run: |
-          choco install -y llvm --version=18.1.6 --allow-downgrade
+          choco install -y llvm --version=19.1.7 --allow-downgrade
       - name: Install llvm-mingw
         if: ${{ matrix.mingw == true }}
         run: |
-          curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20240606/llvm-mingw-20240606-ucrt-x86_64.zip
+          curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250114/llvm-mingw-20250114-ucrt-x86_64.zip
           powershell Expand-Archive llvm-mingw*.zip -DestinationPath .
           del llvm-mingw*.zip
           mv llvm-mingw* c:\llvm-mingw

@mstorsjo
Copy link
Member

@frederick-vs-ja What do you think about merging this PR to the release branch?

I think @ldionne or @philnik777 should reply here. Without this, I guess the clang-cl CI configs will fail on the 20.x release branch.

@github-project-automation github-project-automation bot moved this from Needs Triage to Needs Merge in LLVM Release Status Mar 1, 2025
@tstellar
Copy link
Collaborator

tstellar commented Mar 1, 2025

Does this need to be in 20.1.0 or could it wait until 20.1.1 ?

@mstorsjo
Copy link
Member

mstorsjo commented Mar 1, 2025

Does this need to be in 20.1.0 or could it wait until 20.1.1 ?

The libcxx CI gets failures in the clang-cl configs on Windows, which this fixes. So this change isn't urgent in itself, but if the libcxx CI is run on the release branch, it'll have unrelated errors until this is merged.

This also fixes test failures in the clang-cl build configs that started
a couple days ago. It seems like the failures were triggered by an update
to the base image on the Github provided runners.

There were failures in test/libcxx/system_reserved_names.gen.py, due to
an issue in an Clang intrinsics header (avx512fp16intrin.h); this issue
was observed and fixed for Clang 19 in 6f04f46. The test does
    #define A SYSTEM_RESERVED_NAME
which clashes with a parameter with the name `A` in that header.

By upgrading the toolchain to Clang 19, we get fixed version of this
intrinsics header.

Also update the llvm-mingw toolchains to a version with Clang 19.1.7.

(cherry picked from commit e6a0ee3)
@tstellar tstellar merged commit 20adce8 into llvm:release/20.x Mar 11, 2025
11 of 14 checks passed
@github-project-automation github-project-automation bot moved this from Needs Merge to Done in LLVM Release Status Mar 11, 2025
Copy link

@mstorsjo (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
github:workflow libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi.
Projects
Development

Successfully merging this pull request may close these issues.

5 participants