summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGDR! <gdr@gdr.name>2017-01-24 17:26:47 +0100
committerGDR! <gdr@gdr.name>2017-01-24 17:26:47 +0100
commit5b1cad03a674ed6ac41e5e0081a087b99b00aefd (patch)
treeb75c791bac6936f7303c9dec6a5d197a9b897629
parent5d23e782ff74a287202dec0b61132258d42c3221 (diff)
parente5483bc4662dc95665aeef5bc84adf95a81f7f3c (diff)
Merge branch 'master' of github.com:gjedeer/tuntox
-rw-r--r--.travis.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 078bd30..6f5ffee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,10 @@ before_script:
29 - sudo ldconfig 29 - sudo ldconfig
30 - cd .. 30 - cd ..
31 - sudo apt-get install cscope 31 - sudo apt-get install cscope
32 - pushd .
32 33
33script: 34script:
35 - popd
34 - cd tuntox 36 - cd tuntox
35 - find .. -name Makefile 37 - find .. -name Makefile
36 - make tuntox_nostatic 38 - make tuntox_nostatic
@@ -47,7 +49,7 @@ addons:
47 name: "gjedeer/tuntox" 49 name: "gjedeer/tuntox"
48 description: "Build submitted via Travis CI" 50 description: "Build submitted via Travis CI"
49 notification_email: gdr@gdr.name 51 notification_email: gdr@gdr.name
50# build_command_prepend: "make clean" 52 build_command_prepend: "cd tuntox; make clean"
51 build_command: "make" 53 build_command: "make"
52 branch_pattern: master 54 branch_pattern: master
53 55