From 1cafc5b62a0a869baf4618e30f9cea3d69223d2a Mon Sep 17 00:00:00 2001 From: Edjunior Machado Date: Fri, 30 Sep 2022 12:57:25 +0200 Subject: [PATCH] Add llvm-toolset-15.0 --- build-gating.fmf | 4 ++++ sanity/main.fmf | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/build-gating.fmf b/build-gating.fmf index 2610533..3e1e9e9 100644 --- a/build-gating.fmf +++ b/build-gating.fmf @@ -27,6 +27,10 @@ adjust: environment+: WITH_SCL: "scl enable llvm-toolset-14.0 rust-toolset-1.62" when: "collection == llvm-toolset-14.0" + - because: "When testing SCL-ized LLVM, the collection must be enabled first" + environment+: + WITH_SCL: "scl enable llvm-toolset-15.0 rust-toolset-1.66" + when: "collection == llvm-toolset-15.0" discover: - name: libomp-tests diff --git a/sanity/main.fmf b/sanity/main.fmf index 3159920..e004b87 100644 --- a/sanity/main.fmf +++ b/sanity/main.fmf @@ -34,4 +34,10 @@ adjust: - llvm-toolset-14.0-clang-libs - llvm-toolset-14.0-libomp - llvm-toolset-14.0-libomp-devel - when: "collection == llvm-toolset-14.0" \ No newline at end of file + when: "collection == llvm-toolset-14.0" + - require: + - llvm-toolset-15.0-clang + - llvm-toolset-15.0-clang-libs + - llvm-toolset-15.0-libomp + - llvm-toolset-15.0-libomp-devel + when: "collection == llvm-toolset-15.0"