diff options
| author | redsky17 <rubberduckie3554@gmail.com> | 2019-02-24 16:50:49 -0500 |
|---|---|---|
| committer | redsky17 <rubberduckie3554@gmail.com> | 2019-02-24 16:50:55 -0500 |
| commit | e345cee32f1fa37f5e6aa2ac36b5126f824314e4 (patch) | |
| tree | ca378532b813a54bb8a8d01b14d4db687fbb566c | |
| parent | Update JSON build deps. (diff) | |
| download | nheko-e345cee32f1fa37f5e6aa2ac36b5126f824314e4.tar.xz | |
Switch CI builds to use bundled JSON
Apparently the nlohmann library is not available in the standard repositories. I would rather build it than add universe deps.
| -rwxr-xr-x | .ci/install.sh | 1 | ||||
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | Dockerfile | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/.ci/install.sh b/.ci/install.sh index 426f4c9c..62af2569 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -45,5 +45,4 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then libqt5svg5-dev \ qtmultimedia5-dev \ liblmdb-dev \ - nlohmann-json-dev fi diff --git a/.travis.yml b/.travis.yml index 13af8eec..e52e7272 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ matrix: - DEPLOYMENT=1 - USE_BUNDLED_BOOST=1 - USE_BUNDLED_CMARK=1 - - USE_BUNDLED_JSON=0 + - USE_BUNDLED_JSON=1 addons: apt: sources: ["ubuntu-toolchain-r-test"] @@ -45,7 +45,7 @@ matrix: - QT_PKG=57 - USE_BUNDLED_BOOST=1 - USE_BUNDLED_CMARK=1 - - USE_BUNDLED_JSON=0 + - USE_BUNDLED_JSON=1 addons: apt: sources: ["ubuntu-toolchain-r-test"] @@ -59,7 +59,7 @@ matrix: - QT_PKG=59 - USE_BUNDLED_BOOST=1 - USE_BUNDLED_CMARK=1 - - USE_BUNDLED_JSON=0 + - USE_BUNDLED_JSON=1 addons: apt: sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"] diff --git a/Dockerfile b/Dockerfile index 645b2fc4..163ae532 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,6 @@ RUN \ RUN \ apt-get install -y \ - nlohmann-json-dev \ make \ pkg-config \ ninja-build \ |