From 7c572fccdcbabd1378f5342053aa15c27ab51e71 Mon Sep 17 00:00:00 2001
From: duianto <otnaiud@gmail.com>
Date: Thu, 31 Oct 2019 07:10:43 +0100
Subject: [PATCH] Update .travis.yml, use Emacs from latest Ubuntu

---
 .travis.yml           | 11 ++++++-----
 .travisci/pub_prep.sh | 10 ----------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5f2b08523..5ea9353f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,12 @@
 # TravisCI YAML file
 language: generic
 sudo: required
-dist: trusty
+addons:
+  apt:
+    packages:
+      - ca-certificates
+      - gnutls-bin
+      - emacs
 services:
   - docker
 branches:
@@ -10,15 +15,11 @@ branches:
   - master
   - develop
 env:
-  matrix:
-  - EVM_EMACS=emacs-26.1-travis
   global:
   - secure: "M8NF1Uw7VGkLdNmWiUF4T+VOJXwN8KCKVQb45/BWVpGm88Rcfom/9bxRTUme8VYuzIavph32QF+P9KyhX8aj2p2FMItNnxiEySzap5UrLrNiwB6ZxbQglMJj0yMQKASynNBai9KKI7mYlsM5jRpFJ9OSgj7Ko00RIFpO3EpJ+kE="
   - BOT_NAME=emacspace
   - BOT_EMAIL=emacspace@gmail.com
   - SPACEMACS_REPO_SLUG="syl20bnr/spacemacs"
-before_install:
-  - sudo apt-get install -y libgnutls26
 before_script:
   - docker pull jare/spacetools:latest
 script:
diff --git a/.travisci/pub_prep.sh b/.travisci/pub_prep.sh
index 90deef228..e769d9b93 100755
--- a/.travisci/pub_prep.sh
+++ b/.travisci/pub_prep.sh
@@ -41,16 +41,6 @@ cd  ~/.emacs.d
 cp ./.travisci/.spacemacs ~/
 ln -sf ~/.emacs.d "${TRAVIS_BUILD_DIR}"
 
-fold_start "INSTALLING_${EVM_EMACS}"
-curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw \
-     > /tmp/x.sh && source /tmp/x.sh
-evm install $EVM_EMACS --use --skip
-if [ $? -ne 0 ]; then
-    echo "Installation failed"
-    exit 2
-fi
-fold_end "INSTALLING_${EVM_EMACS}"
-
 fold_start "INSTALLING_DEPENDENCIES"
 emacs -batch -l init.el
 if [ $? -ne 0 ]; then