Merge pull request #1094 from eht16/update_travis_build_to_bionic

Use Ubuntu Bionic for Travis builds

.travis.yml

@@ -1,15 +1,11 @@
 language: c
-
-dist: trusty
-
+dist: bionic
 sudo: false
 
 compiler:
   - gcc
 
 env:
-  global:
-    - LIBGIT2_VERSION=0.21.5
   matrix:
     - GTK3=no
     - GTK3=yes
@@ -19,7 +15,6 @@ cache:
   directories:
     - $HOME/geany/gtk3
     - $HOME/geany/gtk2
-    - $HOME/libgit2-$LIBGIT2_VERSION
 
 addons:
   apt:
@@ -30,10 +25,10 @@ addons:
     - libtool
     - python-docutils
     - check
-    # FIXME: there are weird error with spellcheck and Ubuntu 12.04's version of cppcheck (1.52)
     - cppcheck
     # debugger
     - libvte-dev
+    - libvte-2.91-dev
     # devhelp
     - libwebkitgtk-dev
     - libwnck-dev
@@ -54,9 +49,7 @@ addons:
     # geaniuspaste/updatechecker
     - libsoup2.4-dev
     # git-changebar
-    # Ubuntu 12.04 doesn't have libgit2, 14.04 has a too old one, so we build
-    # our own for now.
-    #- libgit2-dev
+    - libgit2-dev
     # markdown
     - libmarkdown2-dev
     # markdown/webhelper
@@ -68,9 +61,6 @@ addons:
     # spellcheck
     - libenchant-dev
 
-    # for libgit2 build
-    - cmake
-
 before_install:
   # build Geany
   - TEMPDIR=$(mktemp -d)
@@ -101,30 +91,6 @@ before_install:
   - export PKG_CONFIG_PATH="$cachedir/lib/pkgconfig:$PKG_CONFIG_PATH"
   - export LD_LIBRARY_PATH="$cachedir/lib:$LD_LIBRARY_PATH"
 
-  # build libgit2
-  - TEMPDIR=$(mktemp -d)
-  - libgit2dir="libgit2-$LIBGIT2_VERSION"
-  - >
-    if test -f "$HOME/$libgit2dir/lib/pkgconfig/libgit2.pc"; then
-      echo "Using pre-built libgit2 v$LIBGIT2_VERSION.";
-    else
-      ( cd $TEMPDIR || exit 1;
-        wget -q "https://github.com/libgit2/libgit2/archive/v$LIBGIT2_VERSION.tar.gz" -O - |
-          tar -xz "$libgit2dir" || exit 2;
-        cd "$libgit2dir" || exit 3;
-        cmake .                                       \
-          -DCMAKE_INSTALL_PREFIX="$HOME/$libgit2dir"  \
-          -DCMAKE_RULE_MESSAGES=OFF                   \
-          -DBUILD_CLAR=OFF                            \
-          -DBUILD_SHARED_LIBS=ON                      \
-          || exit 4;
-        cmake --build . --target install -- -j2 || exit 5;
-      ) || exit $?;
-    fi
-  - test -z "$TEMPDIR" || rm -rf "$TEMPDIR"
-  - export PKG_CONFIG_PATH="$HOME/$libgit2dir/lib/pkgconfig:$PKG_CONFIG_PATH"
-  - export LD_LIBRARY_PATH="$HOME/$libgit2dir/lib:$LD_LIBRARY_PATH"
-
 before_script:
   # prepare for GP
   - export CFLAGS="-g -O2 -Werror=pointer-arith -Werror=implicit-function-declaration"