summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2019-02-01 12:57:00 -0500
committerTavian Barnes <tavianator@tavianator.com>2019-02-01 12:57:00 -0500
commit3a52c0e1f55d5dd03a00740c191569b9309c0ad6 (patch)
tree65785e4e2e4ff1a0a5ed4ec2f46895d559333616 /.travis.yml
parent23b55d03ddf69b5ab40dc338c419089e8c64930b (diff)
parent36330d7aab63ef2c202efb0d551f104ed6cefa17 (diff)
downloadbfs-3a52c0e1f55d5dd03a00740c191569b9309c0ad6.tar.xz
Merge branch 'improvements'
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml35
1 files changed, 11 insertions, 24 deletions
diff --git a/.travis.yml b/.travis.yml
index 393a947..1acc520 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,37 +1,24 @@
language: c
-script: make check
+script: make distcheck
addons:
apt:
packages:
- - acl-dev
+ - gcc-multilib
+ - libacl1-dev
+ - libacl1:i386
- libcap-dev
+ - libcap2:i386
matrix:
include:
- os: linux
- dist: trusty
- sudo: false
- compiler: gcc
-
- - os: linux
- dist: trusty
- sudo: false
- compiler: gcc
- env:
- - CFLAGS="-m32 -g -Wall"
- addons:
- apt:
- packages:
- - gcc-multilib
- - acl-dev:i386
- - libcap-dev:i386
-
- - os: linux
- dist: trusty
- sudo: false
- compiler: clang
+ dist: xenial
+ before_script:
+ # Ubuntu doesn't let you install the -dev packages for both amd64 and
+ # i386 at once, so we make our own symlinks to fix -m32 -lacl -lcap
+ - sudo ln -s libacl.so.1 /lib/i386-linux-gnu/libacl.so
+ - sudo ln -s libcap.so.2 /lib/i386-linux-gnu/libcap.so
- os: osx
- compiler: clang