From 0103af2d841d1a3f6e835f76616f621bce0c7efb Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 1 Jul 2026 14:43:33 +0200 Subject: [PATCH 1/2] Upgrade LLVM to LLVM 22 in GitHub Action Upgrade LLVM to LLVM 22 in GitHub Action jobs: * Reusable Sanitizer * Reusable Ubuntu ("Install Clang and BOLT") * Tail calling interpreter Keep LLVM 21 for the JIT compiler jobs. --- .github/workflows/reusable-san.yml | 10 +++++----- .github/workflows/reusable-ubuntu.yml | 6 +++--- .github/workflows/tail-call.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/reusable-san.yml b/.github/workflows/reusable-san.yml index 4c76952386095e..00f866c267d6b7 100644 --- a/.github/workflows/reusable-san.yml +++ b/.github/workflows/reusable-san.yml @@ -40,11 +40,11 @@ jobs: # Install clang wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 20 - sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-20 100 - sudo update-alternatives --set clang /usr/bin/clang-20 - sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 100 - sudo update-alternatives --set clang++ /usr/bin/clang++-20 + sudo ./llvm.sh 22 + sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-22 100 + sudo update-alternatives --set clang /usr/bin/clang-22 + sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-22 100 + sudo update-alternatives --set clang++ /usr/bin/clang++-22 if [ "${SANITIZER}" = "TSan" ]; then # Reduce ASLR to avoid TSan crashing diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml index b8f264ff13b2ce..23a4c23ad9de27 100644 --- a/.github/workflows/reusable-ubuntu.yml +++ b/.github/workflows/reusable-ubuntu.yml @@ -49,9 +49,9 @@ jobs: - name: Install Clang and BOLT if: ${{ fromJSON(inputs.bolt-optimizations) }} run: | - sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh 19 - sudo apt-get install --no-install-recommends bolt-19 - echo PATH="$(llvm-config-19 --bindir):$PATH" >> $GITHUB_ENV + sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh 22 + sudo apt-get install --no-install-recommends bolt-22 + echo PATH="$(llvm-config-22 --bindir):$PATH" >> $GITHUB_ENV - name: Configure OpenSSL env vars run: | echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV" diff --git a/.github/workflows/tail-call.yml b/.github/workflows/tail-call.yml index f5b174d87d8448..929a084a11b8df 100644 --- a/.github/workflows/tail-call.yml +++ b/.github/workflows/tail-call.yml @@ -20,7 +20,7 @@ concurrency: env: FORCE_COLOR: 1 - LLVM_VERSION: 21 + LLVM_VERSION: 22 jobs: macos: From d2470a8a8ef6c72c0bf50a9f384486e18225e967 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 3 Jul 2026 13:16:07 +0200 Subject: [PATCH 2/2] Use LLVM 21 instead --- .github/workflows/reusable-san.yml | 10 +++++----- .github/workflows/reusable-ubuntu.yml | 6 +++--- .github/workflows/tail-call.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/reusable-san.yml b/.github/workflows/reusable-san.yml index 00f866c267d6b7..d29f4e83b48dac 100644 --- a/.github/workflows/reusable-san.yml +++ b/.github/workflows/reusable-san.yml @@ -40,11 +40,11 @@ jobs: # Install clang wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 22 - sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-22 100 - sudo update-alternatives --set clang /usr/bin/clang-22 - sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-22 100 - sudo update-alternatives --set clang++ /usr/bin/clang++-22 + sudo ./llvm.sh 21 + sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-21 100 + sudo update-alternatives --set clang /usr/bin/clang-21 + sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-21 100 + sudo update-alternatives --set clang++ /usr/bin/clang++-21 if [ "${SANITIZER}" = "TSan" ]; then # Reduce ASLR to avoid TSan crashing diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml index 23a4c23ad9de27..cd810babb7a9d6 100644 --- a/.github/workflows/reusable-ubuntu.yml +++ b/.github/workflows/reusable-ubuntu.yml @@ -49,9 +49,9 @@ jobs: - name: Install Clang and BOLT if: ${{ fromJSON(inputs.bolt-optimizations) }} run: | - sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh 22 - sudo apt-get install --no-install-recommends bolt-22 - echo PATH="$(llvm-config-22 --bindir):$PATH" >> $GITHUB_ENV + sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh 21 + sudo apt-get install --no-install-recommends bolt-21 + echo PATH="$(llvm-config-21 --bindir):$PATH" >> $GITHUB_ENV - name: Configure OpenSSL env vars run: | echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV" diff --git a/.github/workflows/tail-call.yml b/.github/workflows/tail-call.yml index 929a084a11b8df..f5b174d87d8448 100644 --- a/.github/workflows/tail-call.yml +++ b/.github/workflows/tail-call.yml @@ -20,7 +20,7 @@ concurrency: env: FORCE_COLOR: 1 - LLVM_VERSION: 22 + LLVM_VERSION: 21 jobs: macos: