From 7163ebc2c0c49b258fe70d008d64a4c47316e19b Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sat, 24 Jul 2021 11:28:56 +0200
Subject: [PATCH] build(CI): switch to GitHub Actions, fix Neovim build
 (pynvim/greenlet) (#78)

* add g++ to fix building of greenlet for -py2/-py3 with Neovim's pynvim

* move CI to GitHub Actions

This also adds separate jobs for single example/test builds, e.g. Neovim 0.5 with `-py3` only.

* example/Makefile: do not use -i with docker-run on CI

Using `-i` does not work on GHA:

> the input device is not a TTY

* example/Makefile: consistent whitespace with assignments
---
 .github/workflows/ci.yml | 52 ++++++++++++++++++++++++++++++++++++++++
 .travis.yml              | 11 ---------
 Makefile                 |  2 +-
 README.md                |  8 +++----
 example/Makefile         |  7 ++++--
 scripts/install_vim.sh   |  2 ++
 6 files changed, 64 insertions(+), 18 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..1831335
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,52 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test_single:
+    # Single/simple build instructions to ensure e.g. that build deps for -py2
+    # do not implicitly fix -py3 builds (which might fail otherwise).
+    name: 'test: ${{ matrix.m_name }}'
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - m_name: vim71
+            m_args: -tag v7.1 -name vim71 -prebuild_script 'echo "#define FEAT_PROFILE" >> src/feature.h'
+          - m_name: vim73
+            m_args: -tag v7.3.429 -name vim73 -py
+          - m_name: vim74-trusty
+            m_args: -tag v7.4.052 -name vim74-trusty -py3
+          - m_name: vim-master
+            m_args: -tag master -py2 -py3 -ruby -lua
+          - m_name: neovim-v0.2.0
+            m_args: -tag neovim:v0.2.0 -py2 -py3 -ruby
+          - m_name: neovim-v0.5.0
+            m_args: -tag neovim:v0.5.0 -py3
+          - m_name: neovim-master
+            m_args: -tag neovim:master -py2 -py3 -ruby
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build example for test
+        run: |
+          cat > example/Dockerfile.tests <<EOF
+          FROM vim-testbed-base
+          RUN install_vim ${{ matrix.m_args }} -build
+          EOF
+          make build_example_for_test
+      - run: make -C example test_vims_basic_test
+
+  test_full_example:
+    name: Test full example
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - run: make build_example_for_test
+      - run: make --keep-going test_example
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 88c20cd..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-dist: xenial
-language: minimal
-
-services:
-  - docker
-
-install:
-  - make build_example_for_test
-
-script:
-  - make --keep-going test_example
diff --git a/Makefile b/Makefile
index 9813d10..9f45509 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-TAG:=19
+TAG:=20
 
 build:
 	docker build -t testbed/vim:$(TAG) .
diff --git a/README.md b/README.md
index f0d2720..7b1a251 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Vim Testbed
 
-[![Build Status](https://travis-ci.org/Vimjas/vim-testbed.svg?branch=master)](https://travis-ci.org/Vimjas/vim-testbed)
+[![Build Status](https://github.com/Vimjas/vim-testbed/actions/workflows/ci.yml/badge.svg?branch=master&event=push)](https://github.com/Vimjas/vim-testbed/actions?query=branch%3Amaster+event%3Apush)
 [![](https://badge.imagelayers.io/testbed/vim:latest.svg)](https://imagelayers.io/?images=testbed/vim:latest)
 
 Because unit testing a Vim plugin is a pain in the ass.
@@ -8,11 +8,11 @@ Because unit testing a Vim plugin is a pain in the ass.
 [vader.vim](https://github.com/junegunn/vader.vim) provides a pretty
 straightforward way to test Vim plugins.  But, you'll only be testing on the
 version of Vim you have installed.  Then there's the issue of running automated
-tests with Travis-CI where you have to either:
+tests with CI where you have to either:
 
 - Build Vim from source which takes an eternity, then run your tests.
-- Use the version that came with Ubuntu 12.04 which means you're only testing
-  your plugin's ability to run on 7.3.429.
+- Use the version that comes pre-installed which means you're only testing
+  your plugin's ability to run on some specific, possibly older version.
 
 With this base image, you can build the versions you need and reuse them in
 future tests.
diff --git a/example/Makefile b/example/Makefile
index 7880fbc..84d4860 100644
--- a/example/Makefile
+++ b/example/Makefile
@@ -2,12 +2,15 @@ SHELL := $(shell which bash)
 IMAGE := vim-testbed-example
 PLUGINS := test/plugins
 # A writable home directory, required for Neovim.
-WRITABLE_HOME:=$(shell tmpdir=$$(mktemp -d --dry-run); \
+WRITABLE_HOME := $(shell tmpdir=$$(mktemp -d --dry-run); \
 	mkdir -m 777 $${tmpdir}; \
 	cd $(CURDIR)/test; \
 	cp -a vimrc *.vader $${tmpdir}/; \
 	echo $${tmpdir})
-DOCKER = docker run -it --rm \
+ifneq ($(CI), true)
+  DOCKER_INTERACTIVE := i
+endif
+DOCKER := docker run -t$(DOCKER_INTERACTIVE) --rm \
 	-v $(CURDIR):/testplugin \
 	-v $(WRITABLE_HOME):/home/vimtest \
 	-v $(CURDIR)/$(PLUGINS):/home/vimtest/plugins "$(IMAGE)"
diff --git a/scripts/install_vim.sh b/scripts/install_vim.sh
index a783c29..0c8c6d8 100644
--- a/scripts/install_vim.sh
+++ b/scripts/install_vim.sh
@@ -90,6 +90,7 @@ EOF
       VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-pythoninterp=dynamic"
     else
       apk add python2
+      apk_add_build_dep g++  # for building greenlet
       python2 -m ensurepip
       pip2 install pynvim
     fi
@@ -101,6 +102,7 @@ EOF
       VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-python3interp=dynamic"
     else
       apk add python3
+      apk_add_build_dep g++  # for building greenlet
       apk add py3-pip
       pip3 install pynvim
     fi