diff options
| author | Joel Rosdahl <joel@rosdahl.net> | 2018-09-26 22:34:50 +0200 |
|---|---|---|
| committer | Joel Rosdahl <joel@rosdahl.net> | 2018-09-26 22:34:50 +0200 |
| commit | f7712082106bef085515f86ae47e7dbbd2a48b57 (patch) | |
| tree | 5a726e74b5028d7d633300e3ae455561885b2970 /.travis.yml | |
| parent | 2d57113eaa407bb92de51a3eb41cdd8cca820e3a (diff) | |
| parent | 554195a802cd4bdcc8d7698b0bbaccbf84f33939 (diff) | |
| download | ccache-dev/memcached.tar.gz | |
Merge branch 'master' into dev/memcacheddev/memcached
* master: (27 commits)
Update NEWS
Improve documentation of file_stat_matches_ctime
Add option to disable ctime check for manifest
test: Fix various Solaris shell issues
Prepare for v3.4.3
Update NEWS
Upgrade zlib to 1.2.11
Update NEWS
Bail out on compiler option -save-temps=obj
Fix minor memory leak introduced in dde3543c
Fix “clang analyze” false positive
Update NEWS
process_preprocessed_file: Move gnu_getcwd() out of tight loop
Make sure to install gperf for analyze
Update NEWS
Add handling of separate -target parameter
Update NEWS
Add a Vagrantfile for testing on FreeBSD
Compiler "cc" might still be the same as "clang"
Add FreeBSD compatibility to test suites
...
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 90084093..e09a8023 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ addons: - gperf - elfutils - zlib1g-dev - - lib32z1-dev - libmemcached-dev - libmemcached-tools - memcached @@ -31,6 +30,7 @@ matrix: apt: packages: - gcc-multilib + - lib32z1-dev - os: linux compiler: i686-w64-mingw32-gcc env: HOST="--host=i686-w64-mingw32" TEST="unittest/run.exe" @@ -51,6 +51,7 @@ matrix: apt: packages: - clang # scan-build + - gperf - os: linux compiler: gcc env: CUDA=8.0.61-1 |