Skip to content

Commit

Permalink
feat(docker): Upgrade Vim v8.1.2000 -> v8.1.2300 and NeoVim v0.3.8 ->…
Browse files Browse the repository at this point in the history
… v0.4.3
  • Loading branch information
kkoomen committed Nov 17, 2019
1 parent 6d55a94 commit dac31f8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 34 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
22 changes: 0 additions & 22 deletions playground/test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

/**
Expand Down
19 changes: 9 additions & 10 deletions run-tests
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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'
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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'
Expand Down Expand Up @@ -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 &
Expand Down

0 comments on commit dac31f8

Please sign in to comment.