summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoracio Sanson <hsanson@gmail.com>2021-08-05 08:41:34 +0900
committerGitHub <noreply@github.com>2021-08-05 08:41:34 +0900
commit3ba40b431689f96eac51596f407053607bde24f8 (patch)
tree6e27476f032b33982588e955bc39ff3330e6514a
parent2dd9790281b8fa8e31b664629ecbb06de46c5a70 (diff)
downloadale-3ba40b431689f96eac51596f407053607bde24f8.zip
Add neovim 0.5 to list of test runtimes. (#3830)
* Add neovim 0.5 to list of test runtimes. * Update testbed docker image Co-authored-by: Horacio Sanson <horacio@allm.inc>
-rw-r--r--.github/workflows/main.yml1
-rw-r--r--Dockerfile10
-rwxr-xr-xrun-tests28
3 files changed, 30 insertions, 9 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a06f0482..1867aab4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,6 +30,7 @@ jobs:
- '--vim-82-only'
- '--neovim-02-only'
- '--neovim-04-only'
+ - '--neovim-05-only'
- '--linters-only'
steps:
- uses: actions/checkout@v2
diff --git a/Dockerfile b/Dockerfile
index b685a7a2..41696a0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,17 @@
-FROM tweekmonster/vim-testbed:latest
+FROM testbed/vim:20
RUN install_vim -tag v8.0.0027 -build \
-tag v8.2.2401 -build \
-tag neovim:v0.2.0 -build \
- -tag neovim:v0.4.4 -build
+ -tag neovim:v0.4.4 -build \
+ -tag neovim:v0.5.0 -build
ENV PACKAGES="\
bash \
git \
- python \
- py-pip \
+ python2 \
+ python3 \
+ py3-pip \
grep \
sed \
"
diff --git a/run-tests b/run-tests
index ee2b10cd..6c2153fa 100755
--- a/run-tests
+++ b/run-tests
@@ -1,8 +1,5 @@
#!/usr/bin/env bash
-set -e
-set -u
-
# Author: w0rp <devw0rp@gmail.com>
#
# This script runs tests for the ALE project. Run `./run-tests --help` for
@@ -25,6 +22,7 @@ verbose_flag=''
quiet_flag=''
run_neovim_02_tests=1
run_neovim_04_tests=1
+run_neovim_05_tests=1
run_vim_80_tests=1
run_vim_82_tests=1
run_linters=1
@@ -44,6 +42,7 @@ while [ $# -ne 0 ]; do
run_vim_82_tests=0
run_neovim_02_tests=0
run_neovim_04_tests=0
+ run_neovim_05_tests=0
run_linters=0
shift
;;
@@ -55,6 +54,7 @@ while [ $# -ne 0 ]; do
;;
--neovim-02-only)
run_neovim_04_tests=0
+ run_neovim_05_tests=0
run_vim_80_tests=0
run_vim_82_tests=0
run_linters=0
@@ -62,6 +62,15 @@ while [ $# -ne 0 ]; do
;;
--neovim-04-only)
run_neovim_02_tests=0
+ run_neovim_05_tests=0
+ run_vim_80_tests=0
+ run_vim_82_tests=0
+ run_linters=0
+ shift
+ ;;
+ --neovim-05-only)
+ run_neovim_02_tests=0
+ run_neovim_04_tests=0
run_vim_80_tests=0
run_vim_82_tests=0
run_linters=0
@@ -70,12 +79,14 @@ while [ $# -ne 0 ]; do
--vim-only)
run_neovim_02_tests=0
run_neovim_04_tests=0
+ run_neovim_05_tests=0
run_linters=0
shift
;;
--vim-80-only)
run_neovim_02_tests=0
run_neovim_04_tests=0
+ run_neovim_05_tests=0
run_vim_82_tests=0
run_linters=0
shift
@@ -83,6 +94,7 @@ while [ $# -ne 0 ]; do
--vim-82-only)
run_neovim_02_tests=0
run_neovim_04_tests=0
+ run_neovim_05_tests=0
run_vim_80_tests=0
run_linters=0
shift
@@ -92,13 +104,15 @@ while [ $# -ne 0 ]; do
run_vim_82_tests=0
run_neovim_02_tests=0
run_neovim_04_tests=0
+ run_neovim_05_tests=0
shift
;;
--fast)
run_vim_80_tests=0
run_vim_82_tests=0
run_neovim_02_tests=0
- run_neovim_04_tests=1
+ run_neovim_04_tests=0
+ run_neovim_05_tests=1
shift
;;
--help)
@@ -179,6 +193,9 @@ else
echo "Docker run image ${image}:${image_tag} ready"
fi
+set -e
+set -u
+
docker tag "${image}:${image_tag}" "${image}:latest"
output_dir=$(mktemp -d 2>/dev/null || mktemp -d -t 'mytmpdir')
@@ -216,7 +233,8 @@ 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.4 ]] && ((run_neovim_04_tests)) ); then
+ || ( [[ $vim =~ ^neovim-v0.4 ]] && ((run_neovim_04_tests)) ) \
+ || ( [[ $vim =~ ^neovim-v0.5 ]] && ((run_neovim_05_tests)) ); then
echo "Starting Vim: $vim..."
file_number=$((file_number+1))
test/script/run-vader-tests $quiet_flag $verbose_flag "$vim" "$tests" \