From 16cca1413f6492a2bec1c036f1a0aa66c8219b34 Mon Sep 17 00:00:00 2001 From: Horacio Sanson Date: Wed, 29 Jun 2022 13:17:00 +0900 Subject: [PATCH] Update tests to use latest neovim 0.7 (#4180) * Update tests to use latest neovim 0.7 * Update CI to use neovim 0.7 * Fix conflict --- .github/workflows/main.yml | 2 +- Dockerfile | 2 +- doc/ale-development.txt | 3 +-- run-tests | 22 +++++++++++----------- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f9ad338f..97d5cfd7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: - '--vim-80-only' - '--vim-82-only' - '--neovim-02-only' - - '--neovim-06-only' + - '--neovim-07-only' - '--linters-only' steps: - uses: actions/checkout@v2 diff --git a/Dockerfile b/Dockerfile index e7b0cfb0..7a1113f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM testbed/vim:20 RUN install_vim -tag v8.0.0027 -build \ -tag v8.2.4693 -build \ -tag neovim:v0.2.0 -build \ - -tag neovim:v0.6.1 -build + -tag neovim:v0.7.0 -build ENV PACKAGES="\ bash \ diff --git a/doc/ale-development.txt b/doc/ale-development.txt index 4b4b4c77..a0bba468 100644 --- a/doc/ale-development.txt +++ b/doc/ale-development.txt @@ -156,8 +156,7 @@ environments. 1. Vim 8.0.0027 on Linux via GitHub Actions. 2. Vim 8.2.4693 on Linux via GitHub Actions. 3. NeoVim 0.2.0 on Linux via GitHub Actions. -4. NeoVim 0.4.4 on Linux via GitHub Actions. -5. NeoVim 0.6.1 on Linux via GitHub Actions. +4. NeoVim 0.7.0 on Linux via GitHub Actions. 6. Vim 8 (stable builds) on Windows via AppVeyor. If you are developing ALE code on Linux, Mac OSX, or BSD, you can run ALEs diff --git a/run-tests b/run-tests index 93e94dec..2439b623 100755 --- a/run-tests +++ b/run-tests @@ -25,7 +25,7 @@ tests='test/*.vader test/*/*.vader test/*/*/*.vader test/*/*/*.vader' verbose_flag='' quiet_flag='' run_neovim_02_tests=1 -run_neovim_06_tests=1 +run_neovim_07_tests=1 run_vim_80_tests=1 run_vim_82_tests=1 run_linters=1 @@ -44,7 +44,7 @@ while [ $# -ne 0 ]; do run_vim_80_tests=0 run_vim_82_tests=0 run_neovim_02_tests=0 - run_neovim_06_tests=0 + run_neovim_07_tests=0 run_linters=0 shift ;; @@ -55,13 +55,13 @@ while [ $# -ne 0 ]; do shift ;; --neovim-02-only) - run_neovim_06_tests=0 + run_neovim_07_tests=0 run_vim_80_tests=0 run_vim_82_tests=0 run_linters=0 shift ;; - --neovim-06-only) + --neovim-07-only) run_neovim_02_tests=0 run_vim_80_tests=0 run_vim_82_tests=0 @@ -70,20 +70,20 @@ while [ $# -ne 0 ]; do ;; --vim-only) run_neovim_02_tests=0 - run_neovim_06_tests=0 + run_neovim_07_tests=0 run_linters=0 shift ;; --vim-80-only) run_neovim_02_tests=0 - run_neovim_06_tests=0 + run_neovim_07_tests=0 run_vim_82_tests=0 run_linters=0 shift ;; --vim-82-only) run_neovim_02_tests=0 - run_neovim_06_tests=0 + run_neovim_07_tests=0 run_vim_80_tests=0 run_linters=0 shift @@ -92,14 +92,14 @@ while [ $# -ne 0 ]; do run_vim_80_tests=0 run_vim_82_tests=0 run_neovim_02_tests=0 - run_neovim_06_tests=0 + run_neovim_07_tests=0 shift ;; --fast) run_vim_80_tests=0 run_vim_82_tests=0 run_neovim_02_tests=0 - run_neovim_06_tests=1 + run_neovim_07_tests=1 shift ;; --help) @@ -114,7 +114,7 @@ while [ $# -ne 0 ]; do echo ' --build-image Run docker image build only.' echo ' --neovim-only Run tests only for NeoVim' echo ' --neovim-02-only Run tests only for NeoVim 0.2' - echo ' --neovim-06-only Run tests only for NeoVim 0.6' + echo ' --neovim-07-only Run tests only for NeoVim 0.7' echo ' --vim-only Run tests only for Vim' echo ' --vim-80-only Run tests only for Vim 8.0' echo ' --vim-82-only Run tests only for Vim 8.2' @@ -220,7 +220,7 @@ for vim in $(docker run --rm "$DOCKER_RUN_IMAGE" ls /vim-build/bin | grep '^neov if ( [[ $vim =~ ^vim-v8.0 ]] && ((run_vim_80_tests)) ) \ || ( [[ $vim =~ ^vim-v8.2 ]] && ((run_vim_82_tests)) ) \ || ( [[ $vim =~ ^neovim-v0.2 ]] && ((run_neovim_02_tests)) ) \ - || ( [[ $vim =~ ^neovim-v0.6 ]] && ((run_neovim_06_tests)) ); then + || ( [[ $vim =~ ^neovim-v0.7 ]] && ((run_neovim_07_tests)) ); then echo "Starting Vim: $vim..." file_number=$((file_number+1)) test/script/run-vader-tests $quiet_flag $verbose_flag "$vim" "$tests" \