]> granicus.if.org Git - vim/commitdiff
patch 8.1.1506: syntax error in Travis config v8.1.1506
authorBram Moolenaar <Bram@vim.org>
Sun, 9 Jun 2019 12:51:30 +0000 (14:51 +0200)
committerBram Moolenaar <Bram@vim.org>
Sun, 9 Jun 2019 12:51:30 +0000 (14:51 +0200)
Problem:    Syntax error in Travis config.
Solution:   Set AUDIODEV in another section.

.travis.yml
src/version.c

index 02a449b475b18d777d13fe35eaa3308236b7a5cc..4e7df286d9399c743c5c1fadf4edde2b89d43e77 100644 (file)
@@ -10,9 +10,6 @@ compiler:
   - gcc
 
 env:
-  global:
-      # pretend to play sounds
-      AUDIODEV=null
   - &tiny-nogui
     BUILD=yes TEST=test COVERAGE=no FEATURES=tiny "CONFOPT='--disable-gui'" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
   - &tiny
@@ -141,6 +138,8 @@ before_script:
     if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then
       export DISPLAY=:99.0
       sh -e /etc/init.d/xvfb start && sleep 3
+      # pretend to play sound
+      export AUDIODEV=null
     fi
 
 script:
index 13db30461b74f72abf23c747ecd67e5905ba1646..5c12872644cc0317225ffcd4c3f84c4af3b3e954 100644 (file)
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1506,
 /**/
     1505,
 /**/