diff options
| -rw-r--r-- | .github/workflows/os_comp.yml | 2 | ||||
| -rw-r--r-- | azure-pipelines.yml | 6 | ||||
| -rwxr-xr-x | ci/ciimage/arch/install.sh | 1 | ||||
| -rw-r--r-- | ci/run.ps1 | 2 | ||||
| -rwxr-xr-x | ci/travis_install.sh | 1 |
5 files changed, 7 insertions, 5 deletions
diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml index 839727c..7f3437e 100644 --- a/.github/workflows/os_comp.yml +++ b/.github/workflows/os_comp.yml @@ -15,7 +15,7 @@ jobs: - name: Install Dependencies run: | sudo apt update -yq - sudo apt install -yq --no-install-recommends python3-setuptools python3-pip g++ gfortran gobjc gobjc++ zlib1g-dev python-dev python3-dev + sudo apt install -yq --no-install-recommends python3-setuptools python3-pip g++ gfortran gobjc gobjc++ zlib1g-dev python-dev python3-dev python3-jsonschema - name: Install ninja-build tool uses: seanmiddleditch/gha-setup-ninja@v1 - name: Python version diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad0b6ae..066f1a5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -100,8 +100,8 @@ jobs: displayName: Install Dependencies - script: | set PATH=%CYGWIN_ROOT%\bin;%SYSTEMROOT%\system32 - env.exe -- python3 -m pip --disable-pip-version-check install pefile pytest-xdist - displayName: pip install pefile pytest-xdist + env.exe -- python3 -m pip --disable-pip-version-check install pefile pytest-xdist jsonschema + displayName: pip install pefile pytest-xdist jsonschema - script: | set BOOST_ROOT= set PATH=%CYGWIN_ROOT%\bin;%SYSTEMROOT%\system32 @@ -169,7 +169,7 @@ jobs: mingw-w64-$(MSYS2_ARCH)-python3-setuptools ^ mingw-w64-$(MSYS2_ARCH)-python3-pip ^ %TOOLCHAIN% - %MSYS2_ROOT%\usr\bin\bash -lc "python3 -m pip --disable-pip-version-check install pefile" + %MSYS2_ROOT%\usr\bin\bash -lc "python3 -m pip --disable-pip-version-check install pefile jsonschema" displayName: Install Dependencies - script: | set BOOST_ROOT= diff --git a/ci/ciimage/arch/install.sh b/ci/ciimage/arch/install.sh index 7b6eda9..7fe139e 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 ) @@ -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 346dcb6..5d191f1 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 |