diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-10 14:44:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-05-12 11:17:54 (GMT) |
| commit | 89478e643f42bfdf0ace9f83416536bea9f23fab (patch) | |
| tree | cf98e148b37aeec97c3cf478e78510f652e01e02 /.gitlab/os-linux.yml | |
| parent | 6ff48b862c0f24f9ad9f89c8c3511f22a8a54e9d (diff) | |
| download | CMake-89478e643f42bfdf0ace9f83416536bea9f23fab.zip CMake-89478e643f42bfdf0ace9f83416536bea9f23fab.tar.gz CMake-89478e643f42bfdf0ace9f83416536bea9f23fab.tar.bz2 | |
gitlab-ci: update to Fedora 34 base images
Diffstat (limited to '.gitlab/os-linux.yml')
| -rw-r--r-- | .gitlab/os-linux.yml | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index d0ac85e..e914b00 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -5,7 +5,7 @@ ### Release .linux_prep_source: - image: "fedora:33" + image: "fedora:34" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -68,8 +68,8 @@ ### Fedora -.fedora33: - image: "kitware/cmake:ci-fedora33-x86_64-2021-04-06" +.fedora34: + image: "kitware/cmake:ci-fedora34-x86_64-2021-05-10" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" @@ -77,28 +77,28 @@ #### Lint builds -.fedora33_tidy: - extends: .fedora33 +.fedora34_tidy: + extends: .fedora34 variables: - CMAKE_CONFIGURATION: fedora33_tidy + CMAKE_CONFIGURATION: fedora34_tidy CTEST_NO_WARNINGS_ALLOWED: 1 CMake_SKIP_INSTALL: 1 -.fedora33_sphinx: - extends: .fedora33 +.fedora34_sphinx: + extends: .fedora34 variables: - CMAKE_CONFIGURATION: fedora33_sphinx + CMAKE_CONFIGURATION: fedora34_sphinx CTEST_NO_WARNINGS_ALLOWED: 1 CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" CMake_SKIP_INSTALL: 1 -.fedora33_sphinx_package: - extends: .fedora33 +.fedora34_sphinx_package: + extends: .fedora34 variables: - CMAKE_CONFIGURATION: fedora33_sphinx_package + CMAKE_CONFIGURATION: fedora34_sphinx_package CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" #### Build and test @@ -117,26 +117,26 @@ CMAKE_CONFIGURATION: debian10_aarch64_ninja CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora33_ninja: - extends: .fedora33 +.fedora34_ninja: + extends: .fedora34 variables: - CMAKE_CONFIGURATION: fedora33_ninja + CMAKE_CONFIGURATION: fedora34_ninja CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora33_ninja_multi: - extends: .fedora33 +.fedora34_ninja_multi: + extends: .fedora34 variables: - CMAKE_CONFIGURATION: fedora33_ninja_multi + CMAKE_CONFIGURATION: fedora34_ninja_multi CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Ninja Multi-Config" -.fedora33_makefiles: - extends: .fedora33 +.fedora34_makefiles: + extends: .fedora34 variables: - CMAKE_CONFIGURATION: fedora33_makefiles + CMAKE_CONFIGURATION: fedora34_makefiles CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" @@ -374,7 +374,7 @@ .cmake_org_help: stage: build extends: - - .fedora33 + - .fedora34 - .linux_builder_tags - .cmake_org_help_artifacts script: |