From dac31f888c2aed0078cb421224737e014f540f27 Mon Sep 17 00:00:00 2001 From: Kim K Date: Sun, 17 Nov 2019 11:55:24 +0800 Subject: [PATCH] feat(docker): Upgrade Vim v8.1.2000 -> v8.1.2300 and NeoVim v0.3.8 -> v0.4.3 --- Dockerfile | 4 ++-- playground/test.cpp | 22 ---------------------- run-tests | 19 +++++++++---------- 3 files changed, 11 insertions(+), 34 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6e874503..3d38c985 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM tweekmonster/vim-testbed:latest RUN install_vim -tag v7.4.2119 -py3 -build -RUN install_vim -tag v8.1.2000 -py3 -build +RUN install_vim -tag v8.1.2300 -py3 -build RUN install_vim -tag neovim:v0.2.0 -py3 -build -RUN install_vim -tag neovim:v0.3.8 -py3 -build +RUN install_vim -tag neovim:v0.4.3 -py3 -build # Install base dependencies. RUN apk -v --progress add bash git diff --git a/playground/test.cpp b/playground/test.cpp index 7a98c8dc..96c117e8 100644 --- a/playground/test.cpp +++ b/playground/test.cpp @@ -18,28 +18,6 @@ struct foo { * @foo [TODO:description] */ int foo; - - /** - * @bar [TODO:description] - */ - int bar; - - /** - * @baz [TODO:description] - */ - int baz; - union { - /** - * @foobar [TODO:description] - */ - int foobar; - }; - struct { - /** - * @barbar [TODO:description] - */ - int barbar; - } bar2; }; /** diff --git a/run-tests b/run-tests index 9ce3c822..c2b4d2b4 100755 --- a/run-tests +++ b/run-tests @@ -29,8 +29,7 @@ set -e set -u docker_image=kkoomen/doge -current_docker_image_id=5233c4250426 - +current_docker_image_id=3cb68206d4a8 DOGE_DOCKER_IMAGE="$docker_image" export DOGE_DOCKER_IMAGE @@ -39,7 +38,7 @@ verbose=0 run_vim_74_tests=1 run_vim_81_tests=1 run_neovim_02_tests=1 -run_neovim_03_tests=1 +run_neovim_04_tests=1 run_linter=1 red='\033[0;31m' @@ -57,21 +56,21 @@ while [ $# -ne 0 ]; do --vim-only) run_linter=0 run_neovim_02_tests=0 - run_neovim_03_tests=0 + run_neovim_04_tests=0 shift ;; --vim-74-only) run_linter=0 run_vim_81_tests=0 run_neovim_02_tests=0 - run_neovim_03_tests=0 + run_neovim_04_tests=0 shift ;; --vim-81-only) run_linter=0 run_vim_74_tests=0 run_neovim_02_tests=0 - run_neovim_03_tests=0 + run_neovim_04_tests=0 shift ;; --neovim-only) @@ -84,7 +83,7 @@ while [ $# -ne 0 ]; do run_linter=0 run_vim_74_tests=0 run_vim_81_tests=0 - run_neovim_03_tests=0 + run_neovim_04_tests=0 shift ;; --neovim-03-only) @@ -98,7 +97,7 @@ while [ $# -ne 0 ]; do run_vim_74_tests=0 run_vim_81_tests=0 run_neovim_02_tests=0 - run_neovim_03_tests=0 + run_neovim_04_tests=0 shift ;; --help) @@ -114,7 +113,7 @@ while [ $# -ne 0 ]; do echo ' --vim-81-only Run tests only for Vim 8.1' echo ' --neovim-only Run tests only for NeoVim 0.2 and 0.3' echo ' --neovim-02-only Run tests only for NeoVim 0.2' - echo ' --neovim-03-only Run tests only for NeoVim 0.3' + echo ' --neovim-04-only Run tests only for NeoVim 0.4' echo ' --linters-only Run only Vint' echo ' --help Show this help text' echo ' -- Stop parsing options after this' @@ -183,7 +182,7 @@ for vim in $(docker run --rm "$DOGE_DOCKER_IMAGE" ls /vim-build/bin | grep '^neo if ( [[ $vim =~ ^vim-v7.4 ]] && ((run_vim_74_tests)) ) \ || ( [[ $vim =~ ^vim-v8.1 ]] && ((run_vim_81_tests)) ) \ || ( [[ $vim =~ ^neovim-v0.2 ]] && ((run_neovim_02_tests)) ) \ - || ( [[ $vim =~ ^neovim-v0.3 ]] && ((run_neovim_03_tests)) ); then + || ( [[ $vim =~ ^neovim-v0.4 ]] && ((run_neovim_04_tests)) ); then echo "Starting Vim: $vim..." file_number=$((file_number+1)) scripts/run-vader-tests $verbose_flag "$vim" "$tests" > "$output_dir/$file_number" 2>&1 &