diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-14 19:43:15 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-20 16:18:10 (GMT) |
| commit | 21bc2fd945aa06c640bd609bf1e57cc208d6d6bd (patch) | |
| tree | f7b6695d764cb506c4d0401727f9677eabdecac4 | |
| parent | e3bce8edf435c107dac719952145f68b11b30741 (diff) | |
| download | CMake-21bc2fd945aa06c640bd609bf1e57cc208d6d6bd.zip CMake-21bc2fd945aa06c640bd609bf1e57cc208d6d6bd.tar.gz CMake-21bc2fd945aa06c640bd609bf1e57cc208d6d6bd.tar.bz2 | |
CI: Install jsonschema for schema testing
| -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 8e7a854..9438676 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" |