diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-16 18:59:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-18 14:13:51 (GMT) |
| commit | 99370e990ead426661170cef2e7299059e6120c9 (patch) | |
| tree | bd12bc63c49418bb2b7a8117659f908fe8fcbf59 /.gitlab | |
| parent | 572679a62e835833e7989630d77ab2e9802b1485 (diff) | |
| download | CMake-99370e990ead426661170cef2e7299059e6120c9.zip CMake-99370e990ead426661170cef2e7299059e6120c9.tar.gz CMake-99370e990ead426661170cef2e7299059e6120c9.tar.bz2 | |
gitlab-ci: add jobs to test with Clang and LLVMFlang on Fedora
We already have `t:debian10-{makefiles,ninja}-clang` jobs covering old
versions of Clang with Makefile and Ninja generators. Complement them
with new `t:fedora37-{makefiles,ninja}-clang` jobs covering recent
versions of Clang.
Fedora 37 now packages LLVMFlang, so enable Fortran tests with that
compiler too.
Issue: #22387
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/configure_fedora37_common_clang.cmake | 6 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora37_makefiles_clang.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora37_ninja_clang.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/env_fedora37_common_clang.sh | 4 | ||||
| -rw-r--r-- | .gitlab/ci/env_fedora37_makefiles_clang.sh | 1 | ||||
| -rw-r--r-- | .gitlab/ci/env_fedora37_ninja_clang.sh | 1 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 13 |
7 files changed, 27 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_fedora37_common_clang.cmake b/.gitlab/ci/configure_fedora37_common_clang.cmake new file mode 100644 index 0000000..70c9df9 --- /dev/null +++ b/.gitlab/ci/configure_fedora37_common_clang.cmake @@ -0,0 +1,6 @@ +set(CMAKE_Fortran_COMPILER "/usr/bin/flang-new" CACHE FILEPATH "") +set(CMAKE_Fortran_COMPILER_ID "LLVMFlang" CACHE STRING "") +set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "1" CACHE BOOL "") +set(CMAKE_Fortran_FLAGS "-flang-experimental-exec" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora37_makefiles_clang.cmake b/.gitlab/ci/configure_fedora37_makefiles_clang.cmake new file mode 100644 index 0000000..7b82a9a --- /dev/null +++ b/.gitlab/ci/configure_fedora37_makefiles_clang.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora37_ninja_clang.cmake b/.gitlab/ci/configure_fedora37_ninja_clang.cmake new file mode 100644 index 0000000..7b82a9a --- /dev/null +++ b/.gitlab/ci/configure_fedora37_ninja_clang.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common_clang.cmake") diff --git a/.gitlab/ci/env_fedora37_common_clang.sh b/.gitlab/ci/env_fedora37_common_clang.sh new file mode 100644 index 0000000..b03b757 --- /dev/null +++ b/.gitlab/ci/env_fedora37_common_clang.sh @@ -0,0 +1,4 @@ +export CC=/usr/bin/clang-15 +export CXX=/usr/bin/clang++-15 +export FC=/usr/bin/flang-new +export FFLAGS=-flang-experimental-exec diff --git a/.gitlab/ci/env_fedora37_makefiles_clang.sh b/.gitlab/ci/env_fedora37_makefiles_clang.sh new file mode 100644 index 0000000..9ff1d84 --- /dev/null +++ b/.gitlab/ci/env_fedora37_makefiles_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora37_common_clang.sh diff --git a/.gitlab/ci/env_fedora37_ninja_clang.sh b/.gitlab/ci/env_fedora37_ninja_clang.sh new file mode 100644 index 0000000..9ff1d84 --- /dev/null +++ b/.gitlab/ci/env_fedora37_ninja_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora37_common_clang.sh diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 6a99f33..8fc6ae1 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -200,6 +200,19 @@ variables: CMAKE_CONFIGURATION: debian10_ninja_clang +.fedora37_makefiles_clang: + extends: .fedora37 + + variables: + CMAKE_CONFIGURATION: fedora37_makefiles_clang + CMAKE_GENERATOR: "Unix Makefiles" + +.fedora37_ninja_clang: + extends: .fedora37 + + variables: + CMAKE_CONFIGURATION: fedora37_ninja_clang + ### Sanitizers .fedora_memcheck: |