build(travis): upgrade to ubuntu focal; try capnproto 0.7.0 [skip app…

…veyor]
rime · Sep 6, 2020 · f90180e · f90180e
1 parent f8174bc
commit f90180e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ matrix:
   include:
   - os: linux
     compiler: gcc
-    dist: bionic
+    dist: focal
     sudo: required
     install: "./travis-install.sh"
     script: make test

diff --git a/README.md b/README.md
@@ -40,10 +40,10 @@ Follow the instructions to build librime on platforms other than Linux:
 Build dependencies
 ---
   - compiler with C++14 support
+  - capnproto>=0.7.0
   - cmake>=2.8
-  - capnproto>=0.8.0
   - libboost>=1.48
-  - libcapnp>=0.8.0
+  - libcapnp>=0.7.0
   - libglog (optional)
   - libleveldb
   - libmarisa

diff --git a/travis-install-linux.sh b/travis-install-linux.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
 dep_packages=(
+    capnproto
     doxygen
     libboost-filesystem-dev
     libboost-locale-dev
     libboost-regex-dev
     libboost-system-dev
+    libcapnp-dev
     libgoogle-glog-dev
     libleveldb-dev
     libmarisa-dev
@@ -17,10 +19,3 @@ sudo apt-get install ${dep_packages[@]} -y
 make thirdparty/gtest
 make -C thirdparty/src/opencc build
 sudo env "PATH=$PATH" make -C thirdparty/src/opencc install
-(
-    cd thirdparty/src/capnproto/c++
-    autoreconf -i
-    ./configure
-    make -j3 check
-    sudo make install
-)