Update gitlab ci

Update gitlab ci 2

Update gitlab ci

Update gitlab ci 4

Update gitlab ci 5

Test

Test 2

Test 3

Test 4

Test 5

.gitlab-ci.yml

@@ -1,32 +1,51 @@
 stages:
   - test
+  - deploy
 
 before_script:
-  - apk update; apk add git bash make
+  - apk update
+  - apk add curl git bash neovim
+  - apk add make python3
+  - curl -sSL https://bootstrap.pypa.io/get-pip.py | python3
 
 test-latest:
   stage: test
   image:
     name: thinca/vim:latest-full
     entrypoint: [""]
-  environment:
+  variables:
     MYVIM: vim -T dumb --not-a-term -n
   script: cd ./test/new && make -j1 && make -j1 coverage
+  artifacts:
+    reports:
+      cobertura: ./test/new/coverage.xml
 
 test-8.0.1575:
   stage: test
   image:
     name: thinca/vim:v8.0.1575-full
     entrypoint: [""]
-  environment:
+  variables:
     MYVIM: vim -T dumb --not-a-term -n
-  script: cd ./test/new && make -j1 && make -j1 coverage
+  script: cd ./test/new && make -j1
 
 test-7.4.2273:
   stage: test
   image:
     name: thinca/vim:v7.4.2273-full
     entrypoint: [""]
-  environment:
+  variables:
     MYVIM: vim -T dumb --not-a-term -n
-  script: cd ./test/new && make -j1 && make -j1 coverage
+  script: cd ./test/new && make -j1
+
+pages:
+  stage: deploy
+  script:
+    - mv test/new/htmlcov/ public/
+  artifacts:
+    paths:
+      - public
+    expire_in: 30 days
+  only:
+    - master
+    - dev-test-ts-split

test/new/Makefile

@@ -1,3 +1,7 @@
+COV ?= covimerage run --append --no-report \
+       --data-file $(CURDIR)/.coverage_covimerage \
+       --source $(CURDIR)/../../autoload \
+       --source $(CURDIR)/../../plugin
 MYVIM ?= nvim --headless
 MAKEFLAGS+=--no-print-directory
 
@@ -13,14 +17,14 @@ sysinfo:
 	@-$(MYVIM) --version
 	@echo "**** SYSTEM INFORMATION ****"
 
-$(TESTS):
-	$(MAKE) -C $@
+$(TESTS): env
+	@. env/bin/activate
+	MYVIM="$(COV) $(MYVIM)" $(MAKE) -C $@
 
-coverage: htmlcov/index.html
+coverage: coverage.xml
 
-htmlcov/index.html: env /tmp/vim-profile.txt
+coverage.xml: env .coverage_covimerage
 	. env/bin/activate
-	covimerage write_coverage /tmp/vim-profile.txt --source ../../autoload --source ../../plugin
 	coverage report -m
 	coverage html
 	coverage xml
@@ -29,6 +33,6 @@ env: env/pyvenv.cfg
 
 env/pyvenv.cfg:
 	python3 -m venv env
-	. env/bin/activate;
+	. env/bin/activate
 	pip install setuptools wheel
-	pip install "click<8.0.0" covimerage
+	pip install "click<8.0.0" coverage==4.5.4 covimerage==0.2.1

test/new/common/bootstrap.vim

@@ -3,9 +3,6 @@ set packpath-=~/.config/nvim packpath-=~/.config/nvim/after
 let &rtp = '../../..,' . &rtp
 let &rtp = &rtp . ',../../../after'
 
-profile start /tmp/vim-profile.txt
-profile! file */matchup/*.vim
-
 if $TESTS_ENABLE_TREESITTER
   let s:path = simplify(expand('<sfile>:h').'/../../..')
   let &rtp = s:path.'/test/vader/plugged/nvim-treesitter,' . &rtp