rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
redsky17 2019-02-24 16:50:49 -05:00
parent ee12e01939
commit e345cee32f
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.ci/install.sh
View File

@ -45,5 +45,4 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
libqt5svg5-dev \ libqt5svg5-dev \
qtmultimedia5-dev \ qtmultimedia5-dev \
liblmdb-dev \ liblmdb-dev \
nlohmann-json-dev
fi fi

6
.travis.yml
View File

@ -31,7 +31,7 @@ matrix:
- DEPLOYMENT=1 - DEPLOYMENT=1
- USE_BUNDLED_BOOST=1 - USE_BUNDLED_BOOST=1
- USE_BUNDLED_CMARK=1 - USE_BUNDLED_CMARK=1
- USE_BUNDLED_JSON=0 - USE_BUNDLED_JSON=1
addons: addons:
apt: apt:
sources: ["ubuntu-toolchain-r-test"] sources: ["ubuntu-toolchain-r-test"]
@ -45,7 +45,7 @@ matrix:
- QT_PKG=57 - QT_PKG=57
- USE_BUNDLED_BOOST=1 - USE_BUNDLED_BOOST=1
- USE_BUNDLED_CMARK=1 - USE_BUNDLED_CMARK=1
- USE_BUNDLED_JSON=0 - USE_BUNDLED_JSON=1
addons: addons:
apt: apt:
sources: ["ubuntu-toolchain-r-test"] sources: ["ubuntu-toolchain-r-test"]
@ -59,7 +59,7 @@ matrix:
- QT_PKG=59 - QT_PKG=59
- USE_BUNDLED_BOOST=1 - USE_BUNDLED_BOOST=1
- USE_BUNDLED_CMARK=1 - USE_BUNDLED_CMARK=1
- USE_BUNDLED_JSON=0 - USE_BUNDLED_JSON=1
addons: addons:
apt: apt:
sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"] sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"]

1
Dockerfile
View File

@ -11,7 +11,6 @@ RUN \
RUN \ RUN \
apt-get install -y \ apt-get install -y \
nlohmann-json-dev \
make \ make \
pkg-config \ pkg-config \
ninja-build \ ninja-build \