diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-09 14:51:30 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-09 14:51:30 +0200 |
| commit | b29cfb8c28a66604ebb468c73d86669870a3b06b (patch) | |
| tree | 0b863118c17ad9e31590f2280c261994fff2e5e0 | |
| parent | 8ed75cb0b4d06b8c13dfb12bf3c54be0f6f0c71b (diff) | |
patch 8.1.1506: syntax error in Travis configv8.1.1506
Problem: Syntax error in Travis config.
Solution: Set AUDIODEV in another section.
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 02a449b475..4e7df286d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/src/version.c b/src/version.c index 13db30461b..5c12872644 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1506, +/**/ 1505, /**/ 1504, |