Merge branch 'jc/ci-skip-same-commit' into maint-2.42

[thirdparty/git.git] / .github / workflows / main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1739a0278dc5f22a67d0cc21374e2571cd4ebad3..1b41278a7f0d57a87f3621b6cb56bf0f5198876a 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -259,9 +259,6 @@ jobs:
       fail-fast: false
       matrix:
         vector:
-          - jobname: linux-clang
-            cc: clang
-            pool: ubuntu-latest
           - jobname: linux-sha256
             cc: clang
             pool: ubuntu-latest
@@ -286,11 +283,8 @@ jobs:
           - jobname: linux-leaks
             cc: gcc
             pool: ubuntu-latest
-          - jobname: linux-asan
-            cc: gcc
-            pool: ubuntu-latest
-          - jobname: linux-ubsan
-            cc: gcc
+          - jobname: linux-asan-ubsan
+            cc: clang
             pool: ubuntu-latest
     env:
       CC: ${{matrix.vector.cc}}