Browse Source

Backport the master Travis changes to insp20.

tags/v2.0.24
Peter Powell 2 years ago
parent
commit
b68ba97cf9
2 changed files with 8 additions and 12 deletions
  1. 8
    7
      .travis.yml
  2. 0
    5
      tools/travis-ci.sh

+ 8
- 7
.travis.yml View File

@@ -1,12 +1,13 @@
1 1
 compiler:
2
-  - "clang"
3
-  - "gcc"
4
-language: "cpp"
2
+  - clang
3
+  - gcc
4
+dist: trusty
5
+env:
6
+  - PURE_STATIC=1
7
+  -
8
+language: cpp
5 9
 notifications:
6 10
   email: false
7
-os:
8
-  - "linux"
9
-  - "osx"
10 11
 script:
11
-  - "sh ./tools/travis-ci.sh"
12
+  - sh ./tools/travis-ci.sh
12 13
 sudo: required

+ 0
- 5
tools/travis-ci.sh View File

@@ -4,11 +4,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]
4 4
 then
5 5
 	sudo apt-get update --assume-yes
6 6
 	sudo apt-get install --assume-yes libgeoip-dev libgnutls-dev libldap2-dev libmysqlclient-dev libpcre3-dev libpq-dev libsqlite3-dev libssl-dev libtre-dev
7
-elif [ "$TRAVIS_OS_NAME" = "osx" ]
8
-then
9
-	brew update
10
-	brew install geoip gnutls mysql-connector-c openssl pcre postgresql sqlite3 tre
11
-	brew link sqlite3 --force
12 7
 else
13 8
 	>&2 echo "'$TRAVIS_OS_NAME' is an unknown Travis CI environment!"
14 9
 	exit 1

Loading…
Cancel
Save