diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-03-20 14:45:14 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-04-17 10:49:08 -0700 |
| commit | 91050e0c7c4920d9e793e0b911f8f3255b4d0e3e (patch) | |
| tree | ad8c5e7b05ab148d16943ffc4e6c170de2852f67 /ci | |
| parent | a3f39fde1bca9993450535fa738b5c1820522c0f (diff) | |
| download | meson-91050e0c7c4920d9e793e0b911f8f3255b4d0e3e.tar.gz | |
ci: Add python-jsonschema
Which is used to validate the json schema files in the various test
directories in a unit test.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/ciimage/arch/install.sh | 1 | ||||
| -rw-r--r-- | ci/run.ps1 | 2 | ||||
| -rwxr-xr-x | ci/travis_install.sh | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/ci/ciimage/arch/install.sh b/ci/ciimage/arch/install.sh index 7b6eda9b3..7fe139edc 100755 --- a/ci/ciimage/arch/install.sh +++ b/ci/ciimage/arch/install.sh @@ -12,6 +12,7 @@ pkgs=( itstool gtk3 java-environment=8 gtk-doc llvm clang sdl2 graphviz doxygen vulkan-validation-layers openssh mercurial gtk-sharp-2 qt5-tools libwmf valgrind cmake netcdf-fortran openmpi nasm gnustep-base gettext + python-jsonschema # cuda ) diff --git a/ci/run.ps1 b/ci/run.ps1 index 9811febc9..34856c0cd 100644 --- a/ci/run.ps1 +++ b/ci/run.ps1 @@ -67,7 +67,7 @@ python --version # Needed for running unit tests in parallel. echo "" -python -m pip --disable-pip-version-check install --upgrade pefile pytest-xdist +python -m pip --disable-pip-version-check install --upgrade pefile pytest-xdist jsonschema echo "" echo "=== Start running tests ===" diff --git a/ci/travis_install.sh b/ci/travis_install.sh index 346dcb6b5..5d191f1ca 100755 --- a/ci/travis_install.sh +++ b/ci/travis_install.sh @@ -11,6 +11,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$MESON_ARGS" =~ .*unity=on.* ]]; then which pkg-config || brew install pkg-config fi + python3 -m pip install jsonschema elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then msg "Running Linux setup" docker pull mesonbuild/eoan |