Skip to content

Commit 59e208d

Browse files
authored
Merge pull request #3712 from bhcleek/update-lts
update supported versions of Vim
2 parents afdc935 + 3e96ffa commit 59e208d

File tree

14 files changed

+33
-33
lines changed

14 files changed

+33
-33
lines changed

.github/workflows/git.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [pull_request]
33

44
jobs:
55
autosquash-commits-integrated:
6-
runs-on: ubuntu-20.04
6+
runs-on: ubuntu-22.04
77

88
steps:
99
- uses: actions/[email protected]

.github/workflows/test.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,41 @@ on: [push, pull_request]
33
jobs:
44
lint:
55
name: lint
6-
runs-on: ubuntu-20.04
6+
runs-on: ubuntu-22.04
77
steps:
88
- name: set up python
9-
uses: actions/setup-python@v2.1.4
9+
uses: actions/setup-python@v5.5.0
1010
with:
11-
python-version: 3.6
11+
python-version: 3.7
1212
- name: install vim-vint
1313
run: |
1414
python -m pip install --upgrade pip
1515
pip install vim-vint pathlib
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
26-
runs-on: ubuntu-20.04
26+
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]
3535
with:
3636
go-version: ${{ matrix.go }}
3737
- name: set up python
38-
uses: actions/setup-python@v2.1.4
38+
uses: actions/setup-python@v5.5.0
3939
with:
40-
python-version: 3.6
40+
python-version: 3.7
4141
- name: install covimerage
4242
run: |
4343
python -m pip install --upgrade pip

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
>

plugin/go.vim

Lines changed: 3 additions & 3 deletions
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.1.2269')
17+
let l:unsupported = !has('patch-8.2.5072')
1818
endif
1919

2020
if l:unsupported == 1
2121
echohl Error
22-
echom "vim-go requires at least Vim 8.1.2269 or Neovim 0.4.0, but you're using an older version."
22+
echom "vim-go requires at least Vim 8.2.5072 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.1.2269 or Neovim 0.4.0."
27+
echom "Please do not report bugs unless you're using at least Vim 8.2.5072 or Neovim 0.4.0."
2828
echohl None
2929

3030
" Make sure people see this.

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

0 commit comments

Comments
 (0)