Skip to content
Snippets Groups Projects
Commit 657b93bb authored by Vicente Bolea's avatar Vicente Bolea
Browse files

CI: Updated Fedora33 to Fedora34

parent 39af18b2
No related branches found
No related tags found
No related merge requests found
Showing
with 93 additions and 91 deletions
......@@ -67,6 +67,7 @@ mpi-*,\
openmp-*,\
performance-*,\
-performance-inefficient-string-concatenation,\
-performance-no-int-to-ptr,\
-performance-type-promotion-in-math-fn,\
-performance-unnecessary-value-param,\
portability-*,\
......@@ -74,6 +75,7 @@ readability-*,\
-readability-braces-around-statements,\
-readability-convert-member-functions-to-static,\
-readability-else-after-return,\
-readability-function-cognitive-complexity,\
-readability-function-size,\
-readability-implicit-bool-conversion,\
-readability-inconsistent-declaration-parameter-name,\
......
......@@ -38,73 +38,73 @@ stages:
## Basic builds
build:fedora33-mpi-renderless:
build:fedora34-mpi-renderless:
extends:
- .fedora33_mpi_renderless
- .fedora34_mpi_renderless
- .cmake_build_linux
- .linux_builder_tags
- .cmake_build_artifacts
- .run_manually
test:fedora33-mpi-renderless:
test:fedora34-mpi-renderless:
extends:
- .fedora33_mpi_renderless
- .fedora34_mpi_renderless
- .cmake_test_linux
- .linux_builder_tags
- .cmake_test_artifacts
- .run_automatically
dependencies:
- build:fedora33-mpi-renderless
- build:fedora34-mpi-renderless
needs:
- build:fedora33-mpi-renderless
- build:fedora34-mpi-renderless
test-ext:vtk:fedora33-mpi-renderless:
test-ext:vtk:fedora34-mpi-renderless:
extends:
- .fedora33_mpi_renderless_ext_vtk
- .fedora34_mpi_renderless_ext_vtk
- .cmake_test_external_linux
- .linux_builder_tags
- .cmake_junit_artifacts
- .run_automatically
dependencies:
- test:fedora33-mpi-renderless
- test:fedora34-mpi-renderless
needs:
- test:fedora33-mpi-renderless
- test:fedora34-mpi-renderless
build:fedora33-mpi-offscreen-osmesa-python:
build:fedora34-mpi-offscreen-osmesa-python:
extends:
- .fedora33_mpi_offscreen_osmesa_python
- .fedora34_mpi_offscreen_osmesa_python
- .cmake_build_linux
- .linux_builder_tags
- .cmake_build_artifacts
- .run_manually
test:fedora33-mpi-offscreen-osmesa-python:
test:fedora34-mpi-offscreen-osmesa-python:
extends:
- .fedora33_mpi_offscreen_osmesa_python
- .fedora34_mpi_offscreen_osmesa_python
- .cmake_test_linux
- .linux_qt_builder_tags
- .cmake_test_artifacts
- .run_automatically
dependencies:
- build:fedora33-mpi-offscreen-osmesa-python
- build:fedora34-mpi-offscreen-osmesa-python
needs:
- build:fedora33-mpi-offscreen-osmesa-python
- build:fedora34-mpi-offscreen-osmesa-python
test-ext:vtk:fedora33-mpi-offscreen-osmesa-python:
test-ext:vtk:fedora34-mpi-offscreen-osmesa-python:
extends:
- .fedora33_mpi_offscreen_osmesa_python_ext_vtk
- .fedora34_mpi_offscreen_osmesa_python_ext_vtk
- .cmake_test_external_linux
- .linux_qt_builder_tags
- .cmake_junit_artifacts
- .run_automatically
dependencies:
- test:fedora33-mpi-offscreen-osmesa-python
- test:fedora34-mpi-offscreen-osmesa-python
needs:
- test:fedora33-mpi-offscreen-osmesa-python
- test:fedora34-mpi-offscreen-osmesa-python
# build:fedora33-java-mpi-qt-tbb:
# build:fedora34-java-mpi-qt-tbb:
# extends:
# - .fedora33_java_mpi_qt_tbb
# - .fedora34_java_mpi_qt_tbb
# - .cmake_build_linux
# - .linux_qt_builder_tags
# - .cmake_build_artifacts
......@@ -112,54 +112,54 @@ test-ext:vtk:fedora33-mpi-offscreen-osmesa-python:
# # The Java build extends the build time considerably.
# timeout: 2 hours
# test:fedora33-java-mpi-qt-tbb:
# test:fedora34-java-mpi-qt-tbb:
# extends:
# - .fedora33_java_mpi_qt_tbb
# - .fedora34_java_mpi_qt_tbb
# - .cmake_test_linux
# - .linux_qt_tester_tags
# - .cmake_test_artifacts
# - .run_automatically
# dependencies:
# - build:fedora33-java-mpi-qt-tbb
# - build:fedora34-java-mpi-qt-tbb
# needs:
# - build:fedora33-java-mpi-qt-tbb
# - build:fedora34-java-mpi-qt-tbb
build:fedora33-mpi-python-qt-tbb:
build:fedora34-mpi-python-qt-tbb:
extends:
- .fedora33_mpi_python_qt_tbb
- .fedora34_mpi_python_qt_tbb
- .cmake_build_linux
- .linux_qt_builder_tags
- .cmake_build_artifacts
- .run_manually
timeout: 90 minutes
test:fedora33-mpi-python-qt-tbb:
test:fedora34-mpi-python-qt-tbb:
extends:
- .fedora33_mpi_python_qt_tbb
- .fedora34_mpi_python_qt_tbb
- .cmake_test_linux
- .linux_qt_tester_tags
- .cmake_test_artifacts
- .run_automatically
dependencies:
- build:fedora33-mpi-python-qt-tbb
- build:fedora34-mpi-python-qt-tbb
needs:
- build:fedora33-mpi-python-qt-tbb
- build:fedora34-mpi-python-qt-tbb
test-ext:vtk:fedora33-mpi-python-qt-tbb:
test-ext:vtk:fedora34-mpi-python-qt-tbb:
extends:
- .fedora33_mpi_python_qt_tbb_ext_vtk
- .fedora34_mpi_python_qt_tbb_ext_vtk
- .cmake_test_external_linux
- .linux_qt_tester_tags
- .cmake_junit_artifacts
- .run_automatically
dependencies:
- test:fedora33-mpi-python-qt-tbb
- test:fedora34-mpi-python-qt-tbb
needs:
- test:fedora33-mpi-python-qt-tbb
- test:fedora34-mpi-python-qt-tbb
test:fedora33-mpi-python-qt-stdthread:
test:fedora34-mpi-python-qt-stdthread:
extends:
- .fedora33_mpi_python_qt_stdthread
- .fedora34_mpi_python_qt_stdthread
- .smp_backend_stdthread_env_variable
- .ctest_new_cdash_submission
- .cmake_test_linux
......@@ -167,9 +167,9 @@ test:fedora33-mpi-python-qt-stdthread:
- .cmake_test_artifacts
- .run_automatically
dependencies:
- build:fedora33-mpi-python-qt-tbb
- build:fedora34-mpi-python-qt-tbb
needs:
- build:fedora33-mpi-python-qt-tbb
- build:fedora34-mpi-python-qt-tbb
## Python wheel builds
......@@ -346,9 +346,9 @@ upload:wheel:vtk:
## Static analysis builds
build:fedora33-tidy:
build:fedora34-tidy:
extends:
- .fedora33_tidy
- .fedora34_tidy
- .cmake_build_linux
- .linux_builder_tags
- .cmake_tidy_artifacts
......@@ -359,71 +359,71 @@ build:fedora33-tidy:
## Sanitizer builds
# build:fedora33-asan:
# build:fedora34-asan:
# extends:
# - .fedora33_asan
# - .fedora34_asan
# - .cmake_build_linux
# - .linux_qt_builder_tags
# - .cmake_build_artifacts
# - .run_manually
# test:fedora33-asan:
#
# test:fedora34-asan:
# extends:
# - .fedora33_asan
# - .fedora34_asan
# - .cmake_memcheck_linux
# - .linux_qt_tester_priv_tags
# - .cmake_test_artifacts
# - .run_automatically
# dependencies:
# - build:fedora33-asan
# - build:fedora34-asan
# needs:
# - build:fedora33-asan
# build:fedora33-tsan:
# - build:fedora34-asan
#
# build:fedora34-tsan:
# extends:
# - .fedora33_tsan
# - .fedora34_tsan
# - .cmake_build_linux
# - .linux_qt_builder_tags
# - .cmake_build_artifacts
# - .run_manually
# test:fedora33-tsan:
#
# test:fedora34-tsan:
# extends:
# - .fedora33_tsan
# - .fedora34_tsan
# - .cmake_memcheck_linux
# - .linux_qt_tester_priv_tags
# - .cmake_test_artifacts
# - .run_automatically
# dependencies:
# - build:fedora33-tsan
# - build:fedora34-tsan
# needs:
# - build:fedora33-tsan
# build:fedora33-ubsan:
# - build:fedora34-tsan
#
# build:fedora34-ubsan:
# extends:
# - .fedora33_ubsan
# - .fedora34_ubsan
# - .cmake_build_linux
# - .linux_qt_builder_tags
# - .cmake_build_artifacts
# - .run_manually
# test:fedora33-ubsan:
#
# test:fedora34-ubsan:
# extends:
# - .fedora33_ubsan
# - .fedora34_ubsan
# - .cmake_memcheck_linux
# - .linux_qt_tester_priv_tags
# - .cmake_test_artifacts
# - .run_automatically
# dependencies:
# - build:fedora33-ubsan
# - build:fedora34-ubsan
# needs:
# - build:fedora33-ubsan
# - build:fedora34-ubsan
## Documentation
build:documentation:
extends:
- .fedora33_doxygen_mpi_python_qt_tbb
- .fedora34_doxygen_mpi_python_qt_tbb
- .cmake_build_linux
- .linux_qt_builder_tags
- .cmake_doxygen_artifacts
......
......@@ -3,47 +3,47 @@
{
"group": "master",
"site": "gitlab-ci",
"buildname": "[fedora33_doxygen_mpi_python_qt_tbb]"
"buildname": "[fedora34_doxygen_mpi_python_qt_tbb]"
},
{
"group": "master",
"site": "gitlab-ci",
"buildname": "[fedora33_mpi_offscreen_osmesa_python]"
"buildname": "[fedora34_mpi_offscreen_osmesa_python]"
},
{
"group": "master",
"site": "gitlab-ci",
"buildname": "[fedora33_mpi_offscreen_osmesa_python_ext_vtk]"
"buildname": "[fedora34_mpi_offscreen_osmesa_python_ext_vtk]"
},
{
"group": "master",
"site": "gitlab-ci",
"buildname": "[fedora33_mpi_renderless]"
"buildname": "[fedora34_mpi_renderless]"
},
{
"group": "master",
"site": "gitlab-ci",
"buildname": "[fedora33_mpi_renderless_ext_vtk]"
"buildname": "[fedora34_mpi_renderless_ext_vtk]"
},
{
"group": "master",
"site": "gitlab-ci",
"buildname": "[fedora33_mpi_python_qt_tbb]"
"buildname": "[fedora34_mpi_python_qt_tbb]"
},
{
"group": "master",
"site": "gitlab-ci",
"buildname": "[fedora33_mpi_python_qt_tbb_ext_vtk]"
"buildname": "[fedora34_mpi_python_qt_tbb_ext_vtk]"
},
{
"group": "master",
"site": "gitlab-ci",
"buildname": "[fedora33_mpi_python_qt_stdthread]"
"buildname": "[fedora34_mpi_python_qt_stdthread]"
},
{
"group": "master",
"site": "gitlab-ci",
"buildname": "[fedora33_mpi_python_qt_tbb_tidy]"
"buildname": "[fedora34_mpi_python_qt_tbb_tidy]"
},
{
"group": "master",
......
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33.cmake")
# Fedora 33 ships with Java 11. Setting this as our version avoids warnings
# Fedora 34 ships with Java 11. Setting this as our version avoids warnings
# about not specifying a "bootstrap classpath".
set(VTK_JAVA_SOURCE_VERSION 11 CACHE STRING "")
set(VTK_JAVA_TARGET_VERSION 11 CACHE STRING "")
......
set(VTK_ENABLE_SANITIZER ON CACHE BOOL "")
set(VTK_SANITIZER "undefined" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34.cmake")
......@@ -7,4 +7,4 @@ set(VTK_VERSIONED_INSTALL OFF CACHE BOOL "")
# Disable testing since Doxygen doesn't actually test.
set(VTK_BUILD_TESTING OFF CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34.cmake")
# Qt doesn't support OSMesa.
set(VTK_GROUP_ENABLE_Qt NO CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34.cmake")
......@@ -6,4 +6,4 @@ set(VTK_MODULE_USE_EXTERNAL_VTK_exprtk OFF CACHE BOOL "")
set(VTK_MODULE_USE_EXTERNAL_VTK_ioss OFF CACHE BOOL "")
set(VTK_MODULE_USE_EXTERNAL_VTK_fmt OFF CACHE BOOL "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34.cmake")
set(CMAKE_C_CLANG_TIDY "/usr/bin/clang-tidy" CACHE FILEPATH "")
set(CMAKE_CXX_CLANG_TIDY "/usr/bin/clang-tidy" CACHE FILEPATH "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34.cmake")
set(VTK_ENABLE_SANITIZER ON CACHE BOOL "")
set(VTK_SANITIZER "thread" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34.cmake")
set(VTK_ENABLE_SANITIZER ON CACHE BOOL "")
set(VTK_SANITIZER "undefined" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34.cmake")
FROM fedora:33
FROM fedora:34
MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
COPY install_deps.sh /root/install_deps.sh
......@@ -13,7 +13,7 @@ RUN sh /root/install_adios.sh
COPY install_openvr.sh /root/install_openvr.sh
RUN sh /root/install_openvr.sh
# XXX(fedora34): ispc is too old in Fedora 33
# XXX(fedora34): ispc is too old in Fedora 34
# COPY install_ospray.sh /root/install_ospray.sh
# RUN sh /root/install_ospray.sh
......
......@@ -6,10 +6,10 @@ dnf install -y --setopt=install_weak_deps=False \
# Install the CUDA repository.
dnf config-manager --add-repo \
https://developer.download.nvidia.com/compute/cuda/repos/fedora33/x86_64/cuda-fedora33.repo
https://developer.download.nvidia.com/compute/cuda/repos/fedora34/x86_64/cuda-fedora34.repo
# CUDA toolchain
dnf install -y --setopt=install_weak_deps=False \
cuda-compiler-11-2 cuda-cudart-devel-11-2 cuda-toolkit-11-2
cuda-compiler-11-4 cuda-cudart-devel-11-4 cuda-toolkit-11-4
dnf clean all
......@@ -53,7 +53,7 @@ dnf install -y --setopt=install_weak_deps=False \
# RPMFusion (for ffmpeg)
dnf install -y --setopt=install_weak_deps=False \
https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-33.noarch.rpm
https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-34.noarch.rpm
# RPMFusion external dependencies
dnf install -y --setopt=install_weak_deps=False \
......@@ -64,7 +64,7 @@ dnf install -y --setopt=install_weak_deps=False \
dnf-plugins-core
# Openturns dependencies
dnf config-manager --add-repo https://download.opensuse.org/repositories/science:/openturns/Fedora_33/science:openturns.repo
dnf config-manager --add-repo https://download.opensuse.org/repositories/science:/openturns/Fedora_34/science:openturns.repo
dnf install -y --setopt=install_weak_deps=False \
openturns-libs openturns-devel
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment