aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2014-11-06 20:51:46 +0100
committerJohannes Löthberg <johannes@kyriasis.com>2014-11-06 20:51:46 +0100
commit8707cb94aad8fbdce1d7ec846fc8c693d1d68760 (patch)
tree51f8d5459c7006c24142260499bc1b9d326af815
parente3ae9391d28d74f188b9f752fce4e63f552ea04a (diff)
downloadyawa-8707cb94aad8fbdce1d7ec846fc8c693d1d68760.tar.xz
inline travis.yml script
-rw-r--r--.travis.yml12
-rwxr-xr-xscripts/travis_run.sh3
2 files changed, 7 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index bd8b122..ea2c7de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,16 @@
language: c
compiler: clang
-script: ./scripts/travis_run.sh
+
+script:
+ - cmake -g 'Unix Makefiles' .
+ - make
+
install:
- sudo apt-get update -qq
- sudo apt-get install -y libx11-dev libimlib2-dev libbsd-dev
env:
global:
- # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
- # via the "travis encrypt" command using the project repo's public key
- secure: "Hf1xjFClKIhsv4o4HqAs8pAqKdauJ3TItMH1uqc0qaPRmh0bFhNs0pwwjhmMjnLrbRrRcnfjwEyuXz3wZysiegSedm/tE0NyMFQql+rjgicmTQj73BMzrIDadQ8jMNaeD44YVDlFknv0ren9/LmSFzYLuI8zjAtIyeKxN++IujE="
addons:
@@ -17,6 +19,6 @@ addons:
name: "kyrias/yawa"
description: "Build submitted via Travis CI"
notification_email: johannes@kyriasis.com
- build_command_prepend: "cmake -g 'Unix Makefiles'; make clean"
- build_command: "make -j 4"
+ build_command_prepend: cmake -g 'Unix Makefiles'
+ build_command: make
branch_pattern: coverity_scan
diff --git a/scripts/travis_run.sh b/scripts/travis_run.sh
deleted file mode 100755
index ef9c7b0..0000000
--- a/scripts/travis_run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-cmake -g 'Unix Makefiles' .
-make