diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-21 13:15:21 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-21 09:15:29 -0400 |
| commit | ec3b3d2c2f16397b9a40f79a9783f3d207088b93 (patch) | |
| tree | df256c58602448fe43771e70d382c81649d3efe3 /.gitlab | |
| parent | e59c8f548d2cbb54634f3d1b094e85338734792a (diff) | |
| parent | 21bc2fd945aa06c640bd609bf1e57cc208d6d6bd (diff) | |
| download | cmake-ec3b3d2c2f16397b9a40f79a9783f3d207088b93.tar.gz | |
Merge topic 'cmakepresets-schema' into release-3.19
21bc2fd945 CI: Install jsonschema for schema testing
e3bce8edf4 Tests: Add JSON schema validation to CMakePresets.json tests
0307f7c980 Help: Add JSON schema for CMakePresets.json
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5366
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/configure_fedora31_common.cmake | 1 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora31/install_deps.sh | 1 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab/ci/configure_fedora31_common.cmake b/.gitlab/ci/configure_fedora31_common.cmake index dc068d5164..c3438335b8 100644 --- a/.gitlab/ci/configure_fedora31_common.cmake +++ b/.gitlab/ci/configure_fedora31_common.cmake @@ -1,4 +1,5 @@ set(BUILD_CursesDialog ON CACHE BOOL "") set(BUILD_QtDialog ON CACHE BOOL "") +set(CMake_TEST_JSON_SCHEMA ON CACHE BOOL "") include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/docker/fedora31/install_deps.sh b/.gitlab/ci/docker/fedora31/install_deps.sh index 8de213a82d..fa57f61f21 100755 --- a/.gitlab/ci/docker/fedora31/install_deps.sh +++ b/.gitlab/ci/docker/fedora31/install_deps.sh @@ -65,6 +65,7 @@ dnf install --setopt=install_weak_deps=False -y \ pypy3 pypy3-devel \ python2 python2-devel python2-numpy \ python3 python3-devel python3-numpy \ + python3-jsmin python3-jsonschema \ ruby rubygems ruby-devel \ SDL-devel \ sqlite-devel \ diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 8e7a854f45..9438676260 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -49,7 +49,7 @@ ### Fedora .fedora31: - image: "kitware/cmake:ci-fedora31-x86_64-2020-10-03" + image: "kitware/cmake:ci-fedora31-x86_64-2020-10-20" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" |