diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-12-05 10:45:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-05 10:45:15 +0100 |
| commit | 6423687d1a9e78eb4d90e689ffe8e2d6faeda386 (patch) | |
| tree | 65bef6421044141bb92730d31390bfee9266ed9f | |
| parent | c6610ad5da14ea4a1f45f0fc85d42c86975cb2a0 (diff) | |
| parent | 348a746b9809834650e736cefcdecd76a6b13e83 (diff) | |
Merge pull request #1262 from SaberUK/insp20+fix-travis
[2.0] Backport the master Travis changes to insp20.
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rwxr-xr-x | make/calcdep.pl | 2 | ||||
| -rwxr-xr-x | tools/travis-ci.sh | 5 |
3 files changed, 9 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 631802526..bb82add9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,13 @@ compiler: - - "clang" - - "gcc" -language: "cpp" + - clang + - gcc +dist: trusty +env: + - PURE_STATIC=1 + - +language: cpp notifications: email: false -os: - - "linux" - - "osx" script: - - "sh ./tools/travis-ci.sh" + - sh ./tools/travis-ci.sh sudo: required diff --git a/make/calcdep.pl b/make/calcdep.pl index 4a759a24a..49506dd3b 100755 --- a/make/calcdep.pl +++ b/make/calcdep.pl @@ -160,7 +160,7 @@ END obj/ld-extra.cmd: $core_src \@\$(SOURCEPATH)/make/unit-cc.pl gen-ld\$(VERBOSE) \$\@ \$^ \$> -bin/inspircd: obj/ld-extra.cmd $core_mk +bin/inspircd: $core_mk obj/ld-extra.cmd \@\$(SOURCEPATH)/make/unit-cc.pl static-ld\$(VERBOSE) \$\@ \$^ \$> inspircd: bin/inspircd diff --git a/tools/travis-ci.sh b/tools/travis-ci.sh index 6dbc82300..42b07fa25 100755 --- a/tools/travis-ci.sh +++ b/tools/travis-ci.sh @@ -4,11 +4,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" ] then sudo apt-get update --assume-yes sudo apt-get install --assume-yes libgeoip-dev libgnutls-dev libldap2-dev libmysqlclient-dev libpcre3-dev libpq-dev libsqlite3-dev libssl-dev libtre-dev -elif [ "$TRAVIS_OS_NAME" = "osx" ] -then - brew update - brew install geoip gnutls mysql-connector-c openssl pcre postgresql sqlite3 tre - brew link sqlite3 --force else >&2 echo "'$TRAVIS_OS_NAME' is an unknown Travis CI environment!" exit 1 |