diff options
| author | redsky17 <rubberduckie3554@gmail.com> | 2019-02-24 16:42:37 -0500 |
|---|---|---|
| committer | redsky17 <rubberduckie3554@gmail.com> | 2019-02-24 16:42:37 -0500 |
| commit | ee12e0193990ff70f35b6aedcb2418756c5a60a8 (patch) | |
| tree | 6067fa9155446db95ff0c2160a92eaf1edb29558 /.ci | |
| parent | 4e17b7df72eeb2ac0c1f12590f8d4c517c50288b (diff) | |
Update JSON build deps.
Update JSON build dependencies, change the dockerfile and other
CI files that relate to this. Also update target mtxclient
revision.
Diffstat (limited to '.ci')
| -rwxr-xr-x | .ci/install.sh | 15 | ||||
| -rwxr-xr-x | .ci/script.sh | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/.ci/install.sh b/.ci/install.sh index 72c34127..426f4c9c 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -7,6 +7,9 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install qt5 lmdb clang-format ninja libsodium cmark brew upgrade boost cmake icu4c || true + brew tap nlohmann/json + brew install nlohmann_json + curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py sudo python get-pip.py @@ -35,12 +38,12 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./configure && make && make check && sudo make install popd - sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty sudo apt-get update -qq sudo apt-get install -qq -y \ - qt${QT_PKG}base \ - qt${QT_PKG}tools \ - qt${QT_PKG}svg \ - qt${QT_PKG}multimedia \ - liblmdb-dev + qtbase5-dev \ + qttools5-dev \ + libqt5svg5-dev \ + qtmultimedia5-dev \ + liblmdb-dev \ + nlohmann-json-dev fi diff --git a/.ci/script.sh b/.ci/script.sh index ce65cb14..435f2c27 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -24,7 +24,8 @@ fi # Build & install dependencies cmake -GNinja -Hdeps -B.deps \ -DUSE_BUNDLED_BOOST=${USE_BUNDLED_BOOST} \ - -DUSE_BUNDLED_CMARK=${USE_BUNDLED_CMARK} + -DUSE_BUNDLED_CMARK=${USE_BUNDLED_CMARK} \ + -DUSE_BUNDLED_JSON=${USE_BUNDLED_JSON} cmake --build .deps # Build nheko |