diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-21 13:15:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-21 13:15:29 (GMT) |
| commit | 1a03e1bb015d5ab05d5b39ff28e202f794d49ab6 (patch) | |
| tree | 773bf4c0a6d73b0e2b5d8faefc6f939dc3edb9a5 /.gitlab | |
| parent | 7398b4783e870b0887b449af556be3f455b2e212 (diff) | |
| parent | cf6ac2d365dcfb00b32a0a10ac0c48a401d42ef5 (diff) | |
| download | CMake-1a03e1bb015d5ab05d5b39ff28e202f794d49ab6.zip CMake-1a03e1bb015d5ab05d5b39ff28e202f794d49ab6.tar.gz CMake-1a03e1bb015d5ab05d5b39ff28e202f794d49ab6.tar.bz2 | |
Merge topic 'cmakepresets-schema'
cf6ac2d365 Merge branch 'master' into cmakepresets-schema
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 dc068d5..c343833 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 8de213a..fa57f61 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 217442f..315552b 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/long file name for testing purposes" |