diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile deleted file mode 100644 index b70f2e8..0000000 --- a/.circleci/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM alpine:3.7 -RUN apk add --no-cache make vim git diff --git a/.circleci/README.md b/.circleci/README.md deleted file mode 100644 index 686314e..0000000 --- a/.circleci/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# posva/vim-make - -Small docker image with vim, make and git - -## Building - -```sh -cd .circleci -docker rmi vim-make # remove old image -docker build -t vim-make . -docker run -it vim-make /bin/date -docker commit $(docker ps -lq) vim-make -docker push posva/vim-make:0.3 # replace the tag with a new one -docker container rm $(docker ps -lq) # remove container -``` - -## Cleaning - -To remove old images and containers, use `docker images` and `docker ps -a`. -Then remove them with `docker rmi ` and `docker container rm ` - -## Update `config.yml` - -Make sure to update the tag in the `image` section of `.config.yml` diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 8dbe721..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: 2 - - -jobs: - build: - docker: - - image: posva/vim-make:0.2 - - working_directory: ~/repo - - steps: - - checkout - - - run: make dependencies - - run: make test diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..6943ce2 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,22 @@ +name: Tests + +on: + push: + pull_request: + +jobs: + tests: + strategy: + fail-fast: false + matrix: + editor: [vim, neovim] + version: [stable, nightly] + os: [ubuntu-latest, macos-latest] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + - uses: rhysd/action-setup-vim@v1 + with: + version: ${{ matrix.version }} + neovim: ${{ matrix.editor == 'neovim' }} + - run: make test-${{ matrix.editor }} diff --git a/Makefile b/Makefile index de69007..5303f08 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,9 @@ -test: dependencies +test: test-vim test-neovim + +test-vim: dependencies vim -u test/vimrc -c 'Vader! test/*.vader' -test-nvim: dependencies +test-neovim: dependencies VADER_OUTPUT_FILE=/dev/stderr nvim -u test/vimrc -c 'Vader! test/*.vader' --headless dependencies = \ @@ -25,4 +27,4 @@ dependencies: clean: rm -rf pack -.PHONY: test test-nvim dependencies clean +.PHONY: test test-vim test-neovim dependencies clean diff --git a/readme.md b/readme.md index 99c48a0..8f39a23 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# vim-vue [![CircleCI](https://img.shields.io/circleci/project/github/posva/vim-vue.svg)](https://circleci.com/gh/posva/vim-vue) +# vim-vue Vim syntax highlighting for [Vue components](https://vuejs.org/v2/guide/single-file-components.html).