summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2017-12-17 15:52:34 -0500
committerLibravatar Drew DeVault <sir@cmpwn.com>2017-12-17 15:52:34 -0500
commitd0bd0ed59887fdbcbe0630c23e5d1cc6a254340c (patch)
tree4444227f247f9b7cdb854144eb4332e607c34987 /.travis.yml
parentMerge remote-tracking branch 'besser82/bugfix/json-c' into 0.15 (diff)
downloadsway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.tar.gz
sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.tar.zst
sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.zip
Revert "Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15"
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 1 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 3eeb1682..69634765 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,6 @@ compiler:
6 - gcc 6 - gcc
7 - clang 7 - clang
8 8
9env:
10 - BUILD_TYPE=Release
11 - BUILD_TYPE=Debug
12 - BUILD_TYPE=ASAN
13
14arch: 9arch:
15 packages: 10 packages:
16 - cmake 11 - cmake
@@ -24,7 +19,7 @@ arch:
24 - wlc-git 19 - wlc-git
25 - libcap 20 - libcap
26 script: 21 script:
27 - "cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ." 22 - "cmake ."
28 - "make" 23 - "make"
29 24
30script: 25script: