diff options
Diffstat (limited to '.gitlab/ci')
-rw-r--r-- | .gitlab/ci/configure_fedora31_tidy.cmake | 3 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora33_common.cmake (renamed from .gitlab/ci/configure_fedora31_common.cmake) | 0 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora33_makefiles.cmake (renamed from .gitlab/ci/configure_fedora31_makefiles.cmake) | 0 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora33_ninja.cmake (renamed from .gitlab/ci/configure_fedora31_ninja.cmake) | 2 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora33_ninja_multi.cmake (renamed from .gitlab/ci/configure_fedora31_ninja_multi.cmake) | 0 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora33_sphinx.cmake (renamed from .gitlab/ci/configure_fedora31_sphinx.cmake) | 0 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora33_sphinx_package.cmake (renamed from .gitlab/ci/configure_fedora31_sphinx_package.cmake) | 0 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora33_tidy.cmake | 3 | ||||
-rw-r--r-- | .gitlab/ci/docker/fedora33/Dockerfile (renamed from .gitlab/ci/docker/fedora31/Dockerfile) | 4 | ||||
-rwxr-xr-x | .gitlab/ci/docker/fedora33/install_deps.sh (renamed from .gitlab/ci/docker/fedora31/install_deps.sh) | 0 | ||||
-rwxr-xr-x | .gitlab/ci/docker/fedora33/install_ispc.sh (renamed from .gitlab/ci/docker/fedora31/install_ispc.sh) | 0 | ||||
-rwxr-xr-x | .gitlab/ci/docker/fedora33/install_rvm.sh (renamed from .gitlab/ci/docker/fedora31/install_rvm.sh) | 3 | ||||
-rw-r--r-- | .gitlab/ci/env_fedora33_makefiles.cmake (renamed from .gitlab/ci/env_fedora31_makefiles.cmake) | 0 |
13 files changed, 9 insertions, 6 deletions
diff --git a/.gitlab/ci/configure_fedora31_tidy.cmake b/.gitlab/ci/configure_fedora31_tidy.cmake deleted file mode 100644 index 55d022c..0000000 --- a/.gitlab/ci/configure_fedora31_tidy.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake") diff --git a/.gitlab/ci/configure_fedora31_common.cmake b/.gitlab/ci/configure_fedora33_common.cmake index c343833..c343833 100644 --- a/.gitlab/ci/configure_fedora31_common.cmake +++ b/.gitlab/ci/configure_fedora33_common.cmake diff --git a/.gitlab/ci/configure_fedora31_makefiles.cmake b/.gitlab/ci/configure_fedora33_makefiles.cmake index db2d005..db2d005 100644 --- a/.gitlab/ci/configure_fedora31_makefiles.cmake +++ b/.gitlab/ci/configure_fedora33_makefiles.cmake diff --git a/.gitlab/ci/configure_fedora31_ninja.cmake b/.gitlab/ci/configure_fedora33_ninja.cmake index ea429c1..883f425 100644 --- a/.gitlab/ci/configure_fedora31_ninja.cmake +++ b/.gitlab/ci/configure_fedora33_ninja.cmake @@ -4,4 +4,4 @@ set(CMake_TEST_GUI "ON" CACHE BOOL "") # Cover compilation with C++11 only and not higher standards. set(CMAKE_CXX_STANDARD "11" CACHE STRING "") -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake") diff --git a/.gitlab/ci/configure_fedora31_ninja_multi.cmake b/.gitlab/ci/configure_fedora33_ninja_multi.cmake index efb4b84..efb4b84 100644 --- a/.gitlab/ci/configure_fedora31_ninja_multi.cmake +++ b/.gitlab/ci/configure_fedora33_ninja_multi.cmake diff --git a/.gitlab/ci/configure_fedora31_sphinx.cmake b/.gitlab/ci/configure_fedora33_sphinx.cmake index 90d159b..90d159b 100644 --- a/.gitlab/ci/configure_fedora31_sphinx.cmake +++ b/.gitlab/ci/configure_fedora33_sphinx.cmake diff --git a/.gitlab/ci/configure_fedora31_sphinx_package.cmake b/.gitlab/ci/configure_fedora33_sphinx_package.cmake index e839de8..e839de8 100644 --- a/.gitlab/ci/configure_fedora31_sphinx_package.cmake +++ b/.gitlab/ci/configure_fedora33_sphinx_package.cmake diff --git a/.gitlab/ci/configure_fedora33_tidy.cmake b/.gitlab/ci/configure_fedora33_tidy.cmake new file mode 100644 index 0000000..9052fdc --- /dev/null +++ b/.gitlab/ci/configure_fedora33_tidy.cmake @@ -0,0 +1,3 @@ +set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake") diff --git a/.gitlab/ci/docker/fedora31/Dockerfile b/.gitlab/ci/docker/fedora33/Dockerfile index 80ab379..8ebcb9e 100644 --- a/.gitlab/ci/docker/fedora31/Dockerfile +++ b/.gitlab/ci/docker/fedora33/Dockerfile @@ -1,10 +1,10 @@ -FROM fedora:31 as rvm-build +FROM fedora:33 as rvm-build MAINTAINER Ben Boeckel <ben.boeckel@kitware.com> COPY install_rvm.sh /root/install_rvm.sh RUN sh /root/install_rvm.sh -FROM fedora:31 +FROM fedora:33 MAINTAINER Ben Boeckel <ben.boeckel@kitware.com> COPY install_deps.sh /root/install_deps.sh diff --git a/.gitlab/ci/docker/fedora31/install_deps.sh b/.gitlab/ci/docker/fedora33/install_deps.sh index c1391e3..c1391e3 100755 --- a/.gitlab/ci/docker/fedora31/install_deps.sh +++ b/.gitlab/ci/docker/fedora33/install_deps.sh diff --git a/.gitlab/ci/docker/fedora31/install_ispc.sh b/.gitlab/ci/docker/fedora33/install_ispc.sh index fdc14b5..fdc14b5 100755 --- a/.gitlab/ci/docker/fedora31/install_ispc.sh +++ b/.gitlab/ci/docker/fedora33/install_ispc.sh diff --git a/.gitlab/ci/docker/fedora31/install_rvm.sh b/.gitlab/ci/docker/fedora33/install_rvm.sh index 2332ab7..6d4fa97 100755 --- a/.gitlab/ci/docker/fedora31/install_rvm.sh +++ b/.gitlab/ci/docker/fedora33/install_rvm.sh @@ -13,6 +13,9 @@ dnf install --setopt=install_weak_deps=False -y \ curl -sSL https://get.rvm.io | bash -s stable +# This is intentionally an older version. +# If updating, the associated `env_fedora*_makefiles.cmake` file needs updated +# as well. /usr/local/rvm/bin/rvm install ruby-2.7.0 tar -C /usr/local -cf /root/rvm.tar rvm diff --git a/.gitlab/ci/env_fedora31_makefiles.cmake b/.gitlab/ci/env_fedora33_makefiles.cmake index 1d0efa7..1d0efa7 100644 --- a/.gitlab/ci/env_fedora31_makefiles.cmake +++ b/.gitlab/ci/env_fedora33_makefiles.cmake |