Skip to content

Commit e3e6ce4

Browse files
authored
Merge pull request #476 from lambdalisue/fix-ci
Fix CI
2 parents f7f41b5 + e08060c commit e3e6ce4

File tree

3 files changed

+22
-24
lines changed

3 files changed

+22
-24
lines changed

.github/workflows/neovim.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ name: neovim
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
8-
branches:
9-
- master
108

119
jobs:
1210
build:
@@ -22,19 +20,19 @@ jobs:
2220
- v0.4.4
2321
runs-on: ${{ matrix.os }}
2422
steps:
25-
- uses: actions/checkout@v2
26-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v3
2725
with:
2826
repository: thinca/vim-themis
2927
path: vim-themis
30-
- uses: rhysd/action-setup-vim@v1
31-
id: vim
28+
- uses: thinca/action-setup-vim@v1
29+
id: nvim
3230
with:
33-
neovim: true
34-
version: ${{ matrix.version }}
31+
vim_type: "Neovim"
32+
vim_version: "${{ matrix.version }}"
3533
- name: Run tests
3634
env:
37-
THEMIS_VIM: ${{ steps.vim.outputs.executable }}
35+
THEMIS_VIM: ${{ steps.nvim.outputs.executable }}
3836
# XXX:
3937
# Overwrite %TMP% to point a correct temp directory.
4038
# Note that %TMP% only affects value of 'tempname()' in Windows.

.github/workflows/reviewdog.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ name: reviewdog
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
8-
branches:
9-
- master
108

119
jobs:
1210
vimlint:

.github/workflows/vim.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ name: vim
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
8-
branches:
9-
- master
108

119
jobs:
1210
build:
@@ -18,21 +16,25 @@ jobs:
1816
- windows-latest
1917
- ubuntu-latest
2018
version:
21-
- nightly
22-
- v8.2.0716 # Ubuntu 20.10 (2021/02/28)
23-
- v8.1.2269 # Ubuntu 20.04 (2021/02/28)
19+
- head
20+
- v8.2.0716 # Ubuntu 20.10 (2021/02/28)
21+
- v8.1.2269 # Ubuntu 20.04 (2021/02/28)
2422
runs-on: ${{ matrix.os }}
2523
steps:
26-
- uses: actions/checkout@v2
27-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v3
2826
with:
2927
repository: thinca/vim-themis
3028
path: vim-themis
31-
- uses: rhysd/action-setup-vim@v1
29+
- uses: thinca/action-setup-vim@v1
3230
id: vim
3331
with:
34-
neovim: false
35-
version: ${{ matrix.version }}
32+
vim_type: "Vim"
33+
vim_version: "${{ matrix.version }}"
34+
# NOTE:
35+
# On Linux, Vim must be built from source to fix `input` issue
36+
# https://github.com/thinca/action-setup-vim/issues/11
37+
download: "${{ (runner.OS == 'Linux' && 'never') || 'available' }}"
3638
- name: Run tests
3739
env:
3840
THEMIS_VIM: ${{ steps.vim.outputs.executable }}

0 commit comments

Comments
 (0)