From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 21 Jul 2016 10:22:18 +0000 (+0100)
Subject: Revert "[Minor] Try to feed travis gods"
X-Git-Tag: 1.3.0~34
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=966f6eb51639066b43a331e2c6f083a381794cff;p=rspamd.git

Revert "[Minor] Try to feed travis gods"

This reverts commit 50de464f2d5064ca8d1593581abb4ef327fec94c.
---

diff --git a/.travis.yml b/.travis.yml
index 6c0184423..519bbdaa5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,26 @@
-sudo: false
+sudo: required
+dist: trusty
 
 language: c
 
+#os:
+#  - linux
+#  - osx
+
 python:
   - "3.4"
 
-addons:
-  apt:
-    packages:
-      - cmake
-      - libevent-dev
-      - libglib2.0-dev
-      - libgmime-2.6-dev
-      - libluajit-5.1-dev
-      - libmagic-dev
-      - libpcre3-dev
-      - libssl-dev
-      - make
-      - ragel
-      - redis-server
+before_script:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq cmake libevent-dev libglib2.0-dev libgmime-2.6-dev libluajit-5.1-dev liblua5.1-0-dev libmagic-dev libpcre3-dev libsqlite3-dev libssl-dev make ragel redis-server
+#  - echo $TRAVIS_OS_NAME
+#  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq ; fi
+#  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq cmake libevent-dev libglib2.0-dev libgmime-2.6-dev libluajit-5.1-dev libpcre3-dev libsqlite3-dev libhiredis-dev ; fi
+#  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi
+#  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install cmake gmime glib luajit pcre hiredis sqlite libevent ; fi
 
 script:
+  - chmod a+rx /home/travis
   - cmake . -DCMAKE_INSTALL_PREFIX=./_install -DCMAKE_C_COMPILER=$CC
   - cmake --build . --target install
   - sudo pip install robotframework