From 43efd32fd419051e82cb7e5fb9567905a9521926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=9Blisue?= Date: Tue, 15 Oct 2024 02:58:09 +0900 Subject: [PATCH] Drop support for Vim prior to 8.2.5136 to fix CI on macOS (#507) * Refine GitHub Actions * Drop support for Vim prior to 8.2.5136 See https://github.com/lambdalisue/vim-fern/issues/506 for details. --- .github/workflows/neovim.yml | 13 +++++++------ .github/workflows/reviewdog.yml | 3 ++- .github/workflows/vim.yml | 23 +++++++++-------------- README.md | 2 +- plugin/fern.vim | 4 ++-- 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/.github/workflows/neovim.yml b/.github/workflows/neovim.yml index c53b780..889e5c3 100644 --- a/.github/workflows/neovim.yml +++ b/.github/workflows/neovim.yml @@ -1,10 +1,11 @@ -name: neovim +name: Neovim on: push: branches: - main pull_request: + workflow_dispatch: jobs: build: @@ -20,16 +21,16 @@ jobs: - v0.4.4 runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: repository: thinca/vim-themis path: vim-themis - - uses: thinca/action-setup-vim@v1 + - uses: rhysd/action-setup-vim@v1 id: nvim with: - vim_type: "Neovim" - vim_version: "${{ matrix.version }}" + neovim: true + version: "${{ matrix.version }}" - name: Run tests env: THEMIS_VIM: ${{ steps.nvim.outputs.executable }} diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index beb430d..29873ee 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -5,13 +5,14 @@ on: branches: - main pull_request: + workflow_dispatch: jobs: vimlint: name: runner / vint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: vint uses: reviewdog/action-vint@v1 with: diff --git a/.github/workflows/vim.yml b/.github/workflows/vim.yml index e3aab63..9c4e934 100644 --- a/.github/workflows/vim.yml +++ b/.github/workflows/vim.yml @@ -1,13 +1,14 @@ -name: vim +name: Vim on: push: branches: - main pull_request: + workflow_dispatch: jobs: - build: + test: strategy: fail-fast: false matrix: @@ -16,25 +17,19 @@ jobs: - windows-latest - ubuntu-latest version: - - head - - v8.2.0716 # Ubuntu 20.10 (2021/02/28) - - v8.1.2269 # Ubuntu 20.04 (2021/02/28) + - nightly + - v8.2.5136 # https://github.com/lambdalisue/vim-fern/issues/506 runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: repository: thinca/vim-themis path: vim-themis - - uses: thinca/action-setup-vim@v1 + - uses: rhysd/action-setup-vim@v1 id: vim with: - vim_type: "Vim" - vim_version: "${{ matrix.version }}" - # NOTE: - # On Linux, Vim must be built from source to fix `input` issue - # https://github.com/thinca/action-setup-vim/issues/11 - download: "${{ (runner.OS == 'Linux' && 'never') || 'available' }}" + version: "${{ matrix.version }}" - name: Run tests env: THEMIS_VIM: ${{ steps.vim.outputs.executable }} diff --git a/README.md b/README.md index 18cf5eb..f6c95c5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 🌿 vim-fern -![Support Vim 8.1.2269 or above](https://img.shields.io/badge/support-Vim%208.1.2269%20or%20above-yellowgreen.svg) +![Support Vim 8.2.5136 or above](https://img.shields.io/badge/support-Vim%208.2.5136%20or%20above-yellowgreen.svg) ![Support Neovim 0.4.4 or above](https://img.shields.io/badge/support-Neovim%200.4.4%20or%20above-yellowgreen.svg) [![Powered by vital.vim](https://img.shields.io/badge/powered%20by-vital.vim-80273f.svg)](https://github.com/vim-jp/vital.vim) [![Powered by vital-Whisky](https://img.shields.io/badge/powered%20by-vital--Whisky-80273f.svg)](https://github.com/lambdalisue/vital-Whisky) diff --git a/plugin/fern.vim b/plugin/fern.vim index 5c5e49d..0767359 100644 --- a/plugin/fern.vim +++ b/plugin/fern.vim @@ -23,8 +23,8 @@ if !has('nvim') && !has('patch-8.1.0994') elseif exists('+shellslash') && &shellslash call s:warn('"shellslash" option is not supported thus fern is disabled.') finish -elseif !has('nvim') && !has('patch-8.1.2269') - call s:warn('Vim prior to 8.1.2269 is not supported and fern might not work properly.') +elseif !has('nvim') && !has('patch-8.2.5136') + call s:warn('Vim prior to 8.2.5136 is not supported and fern might not work properly.') elseif has('nvim') && !has('nvim-0.4.4') call s:warn('Neovim prior to 0.4.4 is not supported and fern might not work properly.') endif