diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-11-02 18:22:08 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-11-02 18:22:08 +0100 |
commit | 1a577433ac77b74a965476799619ad0fb2676d31 (patch) | |
tree | a13bad93bb36ebdb347ce7fa35b02eb72e6240de | |
parent | 1ff14ba24c4d85c008d7abe5e140dbb497ffea8d (diff) | |
download | vim-git-1a577433ac77b74a965476799619ad0fb2676d31.tar.gz |
patch 8.1.2239: CI fails when running tests without building Vimv8.1.2239
Problem: CI fails when running tests without building Vim.
Solution: Skip creating doc tags if the execute does not exist.
-rw-r--r-- | runtime/doc/Makefile | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index 443a27a61..57aec4e3c 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -323,7 +323,8 @@ all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED) # Use Vim to generate the tags file. Can only be used when Vim has been # compiled and installed. Supports multiple languages. vimtags: $(DOCS) - $(VIMEXE) -eX -u doctags.vim + @if test -x $(VIMEXE); then $(VIMEXE) -eX -u doctags.vim; \ + else echo "vim executable $(VIMEXE) not found"; fi # Use "doctags" to generate the tags file. Only works for English! tags: doctags $(DOCS) diff --git a/src/version.c b/src/version.c index e1d5c6460..d0f62e9ce 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2239, +/**/ 2238, /**/ 2237, |