Skip to content

Commit 548f782

Browse files
committed
update supported vim versions
Update supported versions of vim and expected versions in tests. All that was 8.1 becomes 8.2 and all that was 8.2 becomes 9.1.
1 parent 4ac1943 commit 548f782

File tree

12 files changed

+23
-23
lines changed

12 files changed

+23
-23
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ jobs:
1616
- name: checkout
1717
uses: actions/[email protected]
1818
- name: install vim
19-
run: $GITHUB_WORKSPACE/scripts/install-vim vim-8.2
19+
run: $GITHUB_WORKSPACE/scripts/install-vim vim-9.1
2020
- name: install tools
21-
run: $GITHUB_WORKSPACE/scripts/install-tools vim-8.2
21+
run: $GITHUB_WORKSPACE/scripts/install-tools vim-9.1
2222
- name: lint
23-
run: $GITHUB_WORKSPACE/scripts/lint vim-8.2
23+
run: $GITHUB_WORKSPACE/scripts/lint vim-9.1
2424
test:
2525
name: test
2626
runs-on: ubuntu-22.04
2727
strategy:
2828
fail-fast: false
2929
matrix:
3030
go: ['1.23','1.24']
31-
vim: ['vim-8.1', 'vim-8.2', 'nvim']
31+
vim: ['vim-8.2', 'vim-9.1', 'nvim']
3232
steps:
3333
- name: setup Go
3434
uses: actions/[email protected]

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ 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.1
1716
RUN scripts/install-vim vim-8.2
17+
RUN scripts/install-vim vim-9.1
1818
RUN scripts/install-vim nvim
1919

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

23-
RUN scripts/install-tools vim-8.1
2423
RUN scripts/install-tools vim-8.2
24+
RUN scripts/install-tools vim-9.1
2525
RUN scripts/install-tools nvim
2626

2727
ENTRYPOINT ["make"]

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VIMS ?= vim-8.1 vim-8.2 nvim
1+
VIMS ?= vim-8.2 vim-9.1 nvim
22
TEST_FLAGS ?=
33

44
all: install lint test
@@ -18,7 +18,7 @@ test:
1818

1919
lint:
2020
@echo "==> Running linting tools"
21-
@./scripts/lint vim-8.2
21+
@./scripts/lint vim-9.1
2222

2323
docker:
2424
@echo "==> Building/starting Docker container"

README.md

Lines changed: 1 addition & 1 deletion
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.1.2269 or Neovim 0.4.0.
37+
vim-go requires at least Vim 8.2.5072 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/debug.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ function! s:message(buf, data) abort
771771
" and
772772
" for every list you receive in a callback, all items except the first
773773
" represent newlines.
774-
774+
call s:logger('DATA: ', '', printf('%s', a:data))
775775
let l:data = printf('%s%s', a:buf, a:data[0])
776776
for l:msg in a:data[1:]
777777
let l:data = printf("%s\n%s", l:data, l:msg)

autoload/go/lint_test.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -602,11 +602,11 @@ func! Test_Errcheck_compilererror() abort
602602
endfunc
603603

604604
func! s:vimdir()
605-
let l:vim = "vim-8.2"
605+
let l:vim = "vim-9.1"
606606
if has('nvim')
607607
let l:vim = 'nvim'
608-
elseif v:version == 810
609-
let l:vim = 'vim-8.1'
608+
elseif v:version == 820
609+
let l:vim = 'vim-8.2'
610610
endif
611611

612612
return l:vim

doc/vim-go.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ experience.
7575
==============================================================================
7676
INSTALL *go-install*
7777

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

scripts/bench-syntax

Lines changed: 1 addition & 1 deletion
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.1', 'vim-8.2', or 'nvim'."
16+
echo "First argument must be 'vim-8.2', 'vim-9.1', or 'nvim'."
1717
exit 1
1818
fi
1919

scripts/install-vim

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@ cd "$vimgodir"
1515
vim=${1:-}
1616

1717
case "$vim" in
18-
"vim-8.1")
18+
"vim-8.2")
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.1.2269"
22+
tag="v8.2.5072"
2323
giturl="https://github.com/vim/vim"
2424

2525
;;
2626

27-
"vim-8.2")
27+
"vim-9.1")
2828
# This is the version that's installed by homebrew currently. It doesn't
2929
# have to stay up to date with homebrew, and is only chosen here because
3030
# that's what homebrew was using at the the time and we need a version to
3131
# vimlint with.
32-
tag="v8.2.0200"
32+
tag="v9.1.1300"
3333
giturl="https://github.com/vim/vim"
3434
;;
3535

3636
"nvim")
3737
# Use latest stable version.
38-
tag="v0.9.0"
38+
tag="v0.9.1"
3939
giturl="https://github.com/neovim/neovim"
4040
;;
4141

scripts/lint

Lines changed: 1 addition & 1 deletion
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.1', 'vim-8.2' or 'nvim'."
14+
echo "First argument must be 'vim-8.2', 'vim-9.1' or 'nvim'."
1515
exit 1
1616
fi
1717

scripts/run-vim

Lines changed: 1 addition & 1 deletion
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.1', 'vim-8.2', or 'nvim'."
20+
echo "First argument must be 'vim-8.2', 'vim-9.1', or 'nvim'."
2121
exit 1
2222
fi
2323

scripts/test

Lines changed: 1 addition & 1 deletion
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.1', 'vim-8.2', or 'nvim'."
46+
echo "First argument must be 'vim-8.2', 'vim-9.1', or 'nvim'."
4747
exit 1
4848
fi
4949

0 commit comments

Comments
 (0)