Skip to content

Commit ddbab88

Browse files
committed
Update required version of Vim
Update the required version of Vim to be the version installed with Ubuntu 20.04 LTS.
1 parent 3289077 commit ddbab88

File tree

13 files changed

+20
-19
lines changed

13 files changed

+20
-19
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
go: ['1.19','1.20']
31-
vim: ['vim-8.0', 'vim-8.2', 'nvim']
31+
vim: ['vim-8.1', 'vim-8.2', 'nvim']
3232
steps:
3333
- name: setup Go
3434
uses: actions/[email protected]

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ USER vim-go
1313
COPY scripts/install-vim /vim-go/scripts/install-vim
1414
WORKDIR /vim-go
1515

16-
RUN scripts/install-vim vim-8.0
16+
RUN scripts/install-vim vim-8.1
1717
RUN scripts/install-vim vim-8.2
1818
RUN scripts/install-vim nvim
1919

2020
COPY . /vim-go/
2121
WORKDIR /vim-go
2222

23-
RUN scripts/install-tools vim-8.0
23+
RUN scripts/install-tools vim-8.1
2424
RUN scripts/install-tools vim-8.2
2525
RUN scripts/install-tools nvim
2626

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VIMS ?= vim-8.0 vim-8.2 nvim
1+
VIMS ?= vim-8.1 vim-8.2 nvim
22
TEST_FLAGS ?=
33

44
all: install lint test

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This plugin adds Go language support for Vim, with the following main features:
3434

3535
## Install
3636

37-
vim-go requires at least Vim 8.0.1453 or Neovim 0.4.0.
37+
vim-go requires at least Vim 8.1.2269 or Neovim 0.4.0.
3838

3939
The [**latest stable release**](https://github.com/fatih/vim-go/releases/latest) is the
4040
recommended version to use. If you choose to use the master branch instead,

autoload/go/lint_test.vim

+2-2
Original file line numberDiff line numberDiff line change
@@ -613,8 +613,8 @@ func! s:vimdir()
613613
let l:vim = "vim-8.2"
614614
if has('nvim')
615615
let l:vim = 'nvim'
616-
elseif v:version == 800
617-
let l:vim = 'vim-8.0'
616+
elseif v:version == 810
617+
let l:vim = 'vim-8.1'
618618
endif
619619

620620
return l:vim

doc/vim-go.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ experience.
7777
==============================================================================
7878
INSTALL *go-install*
7979

80-
vim-go requires at least Vim 8.0.1453 or Neovim 0.4.0. On macOS, if you are
80+
vim-go requires at least Vim 8.1.2269 or Neovim 0.4.0. On macOS, if you are
8181
still using your system version of vim, you can use homebrew to keep your
8282
version of Vim up-to-date with the following terminal command:
8383
>

plugin/go.vim

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ function! s:checkVersion() abort
1414
if has('nvim')
1515
let l:unsupported = !has('nvim-0.4.0')
1616
else
17-
let l:unsupported = !has('patch-8.0.1453')
17+
let l:unsupported = !has('patch-8.1.2269')
1818
endif
1919

2020
if l:unsupported == 1
2121
echohl Error
22-
echom "vim-go requires at least Vim 8.0.1453 or Neovim 0.4.0, but you're using an older version."
22+
echom "vim-go requires at least Vim 8.1.2269 or Neovim 0.4.0, but you're using an older version."
2323
echom "Please update your Vim for the best vim-go experience."
2424
echom "If you really want to continue you can set this to make the error go away:"
2525
echom " let g:go_version_warning = 0"
2626
echom "Note that some features may error out or behave incorrectly."
27-
echom "Please do not report bugs unless you're using at least Vim 8.0.1453 or Neovim 0.4.0."
27+
echom "Please do not report bugs unless you're using at least Vim 8.1.2269 or Neovim 0.4.0."
2828
echohl None
2929

3030
" Make sure people see this.

scripts/bench-syntax

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ cd "$vimgodir"
1313

1414
if [ -z "${1:-}" ]; then
1515
echo "unknown version: '${1:-}'"
16-
echo "First argument must be 'vim-8.0' or 'nvim'."
16+
echo "First argument must be 'vim-8.1', 'vim-8.2', or 'nvim'."
1717
exit 1
1818
fi
1919

scripts/docker-test

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -euC
77
vimgodir=$(cd -P "$(dirname "$0")/.." > /dev/null && pwd)
88
cd "$vimgodir"
99

10-
docker build --tag vim-go-test .
10+
docker build --platform=linux/amd64 --tag vim-go-test .
1111
# seccomp=confined is required for dlv to run in a container, hence it's
1212
# required for vim-go's debug tests.
1313
docker run -e VIMS --rm --security-opt="seccomp=unconfined" vim-go-test

scripts/install-vim

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ cd "$vimgodir"
1515
vim=${1:-}
1616

1717
case "$vim" in
18-
"vim-8.0")
18+
"vim-8.1")
1919
# This follows the version in Ubuntu LTS. Vim's master branch isn't always
2020
# stable, and we don't want to have the build fail because Vim introduced a
2121
# bug.
22-
tag="v8.0.1453"
22+
tag="v8.1.2269"
2323
giturl="https://github.com/vim/vim"
24+
2425
;;
2526

2627
"vim-8.2")
@@ -40,7 +41,7 @@ case "$vim" in
4041

4142
*)
4243
echo "unknown version: '${1:-}'"
43-
echo "First argument must be 'vim-8.0', vim-8.2, or 'nvim'."
44+
echo "First argument must be 'vim-8.1', vim-8.2, or 'nvim'."
4445
exit 1
4546
;;
4647
esac

scripts/lint

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cd "$vimgodir"
1111
#####################################
1212
if [ -z "${1:-}" ]; then
1313
echo "unknown version: '${1:-}'"
14-
echo "First argument must be 'vim-8.0' or 'nvim'."
14+
echo "First argument must be 'vim-8.1', 'vim-8.2' or 'nvim'."
1515
exit 1
1616
fi
1717

scripts/run-vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ shift $((OPTIND - 1))
1717

1818
if [ -z "${1:-}" ]; then
1919
echo "unknown version: '${1:-}'"
20-
echo "First argument must be 'vim-8.0', 'vim-8.2', or 'nvim'."
20+
echo "First argument must be 'vim-8.1', 'vim-8.2', or 'nvim'."
2121
exit 1
2222
fi
2323

scripts/test

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ shift $((OPTIND - 1))
4343
#####################################
4444
if [ -z "${1:-}" ]; then
4545
echo "unknown version: '${1:-}'"
46-
echo "First argument must be 'vim-8.0' or 'nvim'."
46+
echo "First argument must be 'vim-8.1', 'vim-8.2', or 'nvim'."
4747
exit 1
4848
fi
4949

0 commit comments

Comments
 (0)