Skip to content

Commit b1d886a

Browse files
committed
☕ Fix Vim/Neovim setup on CI
1 parent cbaccee commit b1d886a

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

.github/workflows/test.yml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,41 +83,36 @@ jobs:
8383
restore-keys: deno-
8484
path: |
8585
/home/runner/.cache/deno/deps/https/deno.land
86-
- uses: thinca/action-setup-vim@v1
86+
- uses: rhysd/action-setup-vim@v1
8787
id: vim
8888
with:
89-
vim_type: "Vim"
90-
vim_version: "${{ matrix.host_version.vim }}"
91-
# NOTE:
92-
# On Linux, Vim must be built from source to fix `input` issue
93-
# https://github.com/thinca/action-setup-vim/issues/11
94-
download: "${{ (runner.OS == 'Linux' && 'never') || 'available' }}"
89+
version: "${{ matrix.host_version.vim }}"
9590
- name: Check Vim
9691
run: |
9792
echo ${DENOPS_TEST_VIM}
9893
${DENOPS_TEST_VIM} --version
9994
env:
100-
DENOPS_TEST_VIM: ${{ steps.vim.outputs.executable_path }}
101-
- uses: thinca/action-setup-vim@v1
95+
DENOPS_TEST_VIM: ${{ steps.vim.outputs.executable }}
96+
- uses: rhysd/action-setup-vim@v1
10297
id: nvim
10398
with:
104-
vim_type: "Neovim"
105-
vim_version: "${{ matrix.host_version.nvim }}"
99+
neovim: true
100+
version: "${{ matrix.host_version.nvim }}"
106101
- name: Check Neovim
107102
run: |
108103
echo ${DENOPS_TEST_NVIM}
109104
${DENOPS_TEST_NVIM} --version
110105
env:
111-
DENOPS_TEST_NVIM: ${{ steps.nvim.outputs.executable_path }}
106+
DENOPS_TEST_NVIM: ${{ steps.nvim.outputs.executable }}
112107
- name: Cache
113108
run: deno cache $(find . -name '*.ts')
114109
working-directory: ./repo
115110
- name: Test
116111
run: deno task test
117112
env:
118113
DENOPS_TEST_DENOPS_PATH: "../denops.vim"
119-
DENOPS_TEST_VIM_EXECUTABLE: ${{ steps.vim.outputs.executable_path }}
120-
DENOPS_TEST_NVIM_EXECUTABLE: ${{ steps.nvim.outputs.executable_path }}
114+
DENOPS_TEST_VIM_EXECUTABLE: ${{ steps.vim.outputs.executable }}
115+
DENOPS_TEST_NVIM_EXECUTABLE: ${{ steps.nvim.outputs.executable }}
121116
working-directory: ./repo
122117
timeout-minutes: 3
123118
- run: |

0 commit comments

Comments
 (0)