From aef9d29f2f63df1258ea1663fc135801715519ee Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 26 Jan 2024 14:12:33 +0100 Subject: [PATCH 1/2] linux_and_macos.yml: Get installation of Clang 18 on Linux back in sync .. with apt.llvm.org --- .github/workflows/linux_and_macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux_and_macos.yml b/.github/workflows/linux_and_macos.yml index c0eab6e..4708d85 100644 --- a/.github/workflows/linux_and_macos.yml +++ b/.github/workflows/linux_and_macos.yml @@ -37,7 +37,7 @@ jobs: - cc: clang-18 cxx: clang++-18 clang_major_version: 18 - clang_repo_suffix: + clang_repo_suffix: -18 make: bmake runs-on: ubuntu-22.04 - cc: musl-gcc From 321ebd5f9abf205a71cf36e6b90af22e58b398c0 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 26 Jan 2024 14:13:28 +0100 Subject: [PATCH 2/2] linux_and_macos.yml: Drop compilation with Clang 17 .. because Clang 18 is stricter, we have no Code specific to Clang 17, and bmake on Linux is still covered by other matrix entries. --- .github/workflows/linux_and_macos.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/linux_and_macos.yml b/.github/workflows/linux_and_macos.yml index 4708d85..a1e24c2 100644 --- a/.github/workflows/linux_and_macos.yml +++ b/.github/workflows/linux_and_macos.yml @@ -28,12 +28,6 @@ jobs: clang_repo_suffix: null make: make runs-on: ubuntu-22.04 - - cc: clang-17 - cxx: clang++-17 - clang_major_version: 17 - clang_repo_suffix: -17 - make: bmake - runs-on: ubuntu-22.04 - cc: clang-18 cxx: clang++-18 clang_major_version: 18