diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2017-02-14 15:00:47 +0100 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2017-02-14 15:05:48 +0100 |
| commit | a8890ab657793e16f6c3cefdbc03cc87c21e1004 (patch) | |
| tree | 7eb9dd71455f6cabc6ac17fbfde99e37777ad764 | |
| parent | 74d0df6d706aa163175aa73c46ce4d8458cd2001 (diff) | |
| download | vis-a8890ab657793e16f6c3cefdbc03cc87c21e1004.tar.gz vis-a8890ab657793e16f6c3cefdbc03cc87c21e1004.tar.xz | |
travis: tweak build matrix
Try to test the different regex backends and builds with/without Lua support.
| -rw-r--r-- | .travis.yml | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index abb4009..0402ce5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,17 +6,17 @@ matrix: compiler: gcc env: TARGET= - os: linux - compiler: gcc - env: TARGET=debug - - os: linux - compiler: gcc - env: TARGET=coverage - - os: linux compiler: clang env: TARGET= - os: linux + compiler: gcc + env: TARGET=debug + - os: linux compiler: clang env: TARGET=debug + - os: linux + compiler: gcc + env: TARGET= CONFIG=--disable-lua - os: osx compiler: clang env: TARGET= @@ -25,12 +25,16 @@ matrix: env: TARGET=debug - os: osx compiler: clang - env: TARGET=coverage + env: TARGET= CONFIG=--disable-lua + - os: osx + compiler: clang + env: TARGET= CONFIG=--disable-tre addons: apt: packages: - 9base + - libacl1-dev cache: directories: @@ -42,12 +46,8 @@ before_install: install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && - brew install libtermkey && - brew install lua && + brew install libtermkey lua tre plan9port && luarocks install lpeg; - if [ "$TARGET" = "coverage" ]; then - brew install plan9port; - fi fi script: @@ -55,11 +55,11 @@ script: - env - locale - tty || true - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then - ./configure && make $TARGET; - else - make local && make clean && make $TARGET; + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then + make local && make clean; fi + - ./configure CFLAGS=-Idependency/install/usr/include LDFLAGS=-Ldependency/install/usr/lib $CONFIG + - make $TARGET - file vis - if [ "$TRAVIS_OS_NAME" = "osx" ]; then otool -L vis; @@ -68,13 +68,11 @@ script: fi - size vis - LD_LIBRARY_PATH="$(pwd)/dependency/install/usr/lib" ./vis -v - - LD_LIBRARY_PATH="$(pwd)/dependency/install/usr/lib" make -C test/core $TARGET + - LD_LIBRARY_PATH="$(pwd)/dependency/install/usr/lib" make -C test/core coverage - LD_LIBRARY_PATH="$(pwd)/dependency/install/usr/lib" make -C test/lua - LD_LIBRARY_PATH="$(pwd)/dependency/install/usr/lib" make -C test/vis - LD_LIBRARY_PATH="$(pwd)/dependency/install/usr/lib" make -C test/sam - LD_LIBRARY_PATH="$(pwd)/dependency/install/usr/lib" make -C test/vim after_success: - - if [ "$TARGET" = "coverage" ]; then - bash <(curl -s https://codecov.io/bash); - fi + - bash <(curl -s https://codecov.io/bash) |