Merge fedora and snapshot configs for integration-test-suite
Now that snapshots also include libcxx and mlir, we can use the normal fedora configuration. Also drop the conditions for fedora versions older than 40, which are no longer supported.
This commit is contained in:
parent
023ec1ee03
commit
cce3cc4dde
2 changed files with 3 additions and 46 deletions
|
|
@ -1,6 +1,5 @@
|
|||
# Fedora system repos package testing.
|
||||
# This setup is meant to be used with packages in system repos, not with
|
||||
# compat packages, or snapshots.
|
||||
# Fedora package testing.
|
||||
# This setup is meant to be used with non-compat packages.
|
||||
|
||||
require+:
|
||||
- cmake
|
||||
|
|
@ -21,19 +20,5 @@ require+:
|
|||
|
||||
adjust+:
|
||||
- enabled: false
|
||||
when: distro != fedora or snapshot is defined or compat is defined
|
||||
when: distro != fedora or compat is defined
|
||||
continue: false
|
||||
|
||||
# libomp and lld are supported in s390x for LLVM >= 18. Until tmt provides
|
||||
# a way to provide custom contexts, we need to filter out by distro versions.
|
||||
- require-:
|
||||
- lld
|
||||
- libomp-devel
|
||||
when: arch == s390x and distro < fedora-40
|
||||
|
||||
# libunwind is not built for s390x in LLVM < 17
|
||||
- require-:
|
||||
- llvm-libunwind-devel
|
||||
environment+:
|
||||
NO_LIBUNWIND: true
|
||||
when: arch == s390x and distro < fedora-39
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
# llvm-snapshots specific setup.
|
||||
# These are daily builds (latest upstream sources) of a reduced set of the llvm
|
||||
# components in currently supported Fedora releases.
|
||||
# Supported components can be checked in:
|
||||
# https://copr.fedorainfracloud.org/coprs/g/fedora-llvm-team/llvm-snapshots/monitor/
|
||||
|
||||
require+:
|
||||
- cmake
|
||||
- clang
|
||||
- clang-analyzer
|
||||
- clang-devel
|
||||
- clang-tools-extra
|
||||
- compiler-rt
|
||||
- lld
|
||||
- lldb
|
||||
- libomp-devel
|
||||
- llvm-devel
|
||||
- python3-lit
|
||||
|
||||
environment+:
|
||||
NO_LIBCXX: true
|
||||
NO_STATIC_LIBCXX: true
|
||||
NO_LIBUNWIND: true
|
||||
|
||||
adjust+:
|
||||
- enabled: false
|
||||
when: snapshot is not defined or distro == rhel
|
||||
continue: false
|
||||
Loading…
Add table
Add a link
Reference in a new issue