From 49fbcb5b8239df9d032e01d54c7f50ffea5e7e3f Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sat, 29 Oct 2022 21:11:56 +0200
Subject: ci: use GHA default clang for asan, tsan jobs #20846

Default is currently clang 14. GHA images are updated at least once per year, so
we don't need to manually install a newer clang version.

Also remove step for installing clang-13 since it's not needed anymore.
---
 .github/workflows/ci.yml | 12 ++----------
 .github/workflows/env.sh |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 08eeb614fc..47d6092b73 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -208,11 +208,11 @@ jobs:
       matrix:
         include:
           - flavor: asan
-            cc: clang-13
+            cc: clang
             runner: ubuntu-22.04
             os: linux
           - flavor: tsan
-            cc: clang-13
+            cc: clang
             runner: ubuntu-22.04
             os: linux
           - flavor: uchar
@@ -269,14 +269,6 @@ jobs:
             exit 1
           }
 
-      - name: Install new clang
-        if: matrix.flavor == 'asan' || matrix.flavor == 'tsan'
-        run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod a+x llvm.sh
-          sudo ./llvm.sh 13
-          rm llvm.sh
-
       - name: Install brew packages
         if: matrix.os == 'osx'
         run: |
diff --git a/.github/workflows/env.sh b/.github/workflows/env.sh
index da70d358a9..4b4df39ec0 100755
--- a/.github/workflows/env.sh
+++ b/.github/workflows/env.sh
@@ -30,7 +30,7 @@ case "$FLAVOR" in
     BUILD_FLAGS="$BUILD_FLAGS -DPREFER_LUA=ON"
     cat <<EOF >> "$GITHUB_ENV"
 CLANG_SANITIZER=ASAN_UBSAN
-SYMBOLIZER=asan_symbolize-13
+SYMBOLIZER=asan_symbolize
 ASAN_OPTIONS=detect_leaks=1:check_initialization_order=1:log_path=$GITHUB_WORKSPACE/build/log/asan:intercept_tls_get_addr=0
 UBSAN_OPTIONS=print_stacktrace=1 log_path=$GITHUB_WORKSPACE/build/log/ubsan
 EOF
-- 
cgit