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 /.travis.yml | |
| 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 '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index c5cd84c2..13af8eec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: cpp sudo: required -dist: trusty +dist: bionic notifications: webhooks: @@ -20,6 +20,7 @@ matrix: - DEPLOYMENT=1 - USE_BUNDLED_BOOST=0 - USE_BUNDLED_CMARK=0 + - USE_BUNDLED_JSON=0 - os: linux compiler: gcc env: @@ -30,6 +31,7 @@ matrix: - DEPLOYMENT=1 - USE_BUNDLED_BOOST=1 - USE_BUNDLED_CMARK=1 + - USE_BUNDLED_JSON=0 addons: apt: sources: ["ubuntu-toolchain-r-test"] @@ -43,6 +45,7 @@ matrix: - QT_PKG=57 - USE_BUNDLED_BOOST=1 - USE_BUNDLED_CMARK=1 + - USE_BUNDLED_JSON=0 addons: apt: sources: ["ubuntu-toolchain-r-test"] @@ -56,6 +59,7 @@ matrix: - QT_PKG=59 - USE_BUNDLED_BOOST=1 - USE_BUNDLED_CMARK=1 + - USE_BUNDLED_JSON=0 addons: apt: sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"] @@ -109,4 +113,4 @@ deploy: on: condition: "$TRAVIS_OS_NAME == osx && $DEPLOYMENT == 1" repo: Nheko-Reborn/nheko - tags: true
\ No newline at end of file + tags: true |