Add macos-latest runner

adriaanzon · Mar 23, 2024 · fc01a76 · fc01a76
1 parent 89408fa
commit fc01a76
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,17 +6,15 @@ jobs:
   tests:
     strategy:
       matrix:
+        editor: [vim, neovim]
         version: [stable, nightly]
-        neovim: [true, false]
-    name: ${{ matrix.neovim && 'neovim' || 'vim' }} ${{ matrix.version }}
-    runs-on: ubuntu-latest
+        os: [ubuntu-latest, macos-latest]
+    name: ${{ matrix.editor }}-${{ matrix.version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: rhysd/action-setup-vim@v1
         with:
           version: ${{ matrix.version }}
-          neovim: ${{ matrix.neovim }}
-      - run: make test
-        if: ${{ !matrix.neovim }}
-      - run: make test-nvim
-        if: ${{ matrix.neovim }}
+          neovim: ${{ matrix.editor == 'neovim' }}
+      - run: make test-${{ matrix.editor }}
diff --git a/Makefile b/Makefile
@@ -1,10 +1,12 @@
-test: deps
+test: test-vim test-neovim
+
+test-vim: dependencies
 	vim -u test/vimrc -c 'Vader! test/*.vader'
 
-test-nvim: deps
+test-neovim: dependencies
 	VADER_OUTPUT_FILE=/dev/stderr nvim -u test/vimrc -c 'Vader! test/*.vader' --headless
 
-deps:
+dependencies:
 	test -L pack/testing/start/vim-textobj-matchit && exit 0; \
 	mkdir -p pack/testing/start; \
 	cd pack/testing/start; \
@@ -16,4 +18,4 @@ deps:
 clean:
 	rm -rf pack
 
-.PHONY: test test-nvim deps clean
+.PHONY: test test-vim test-neovim dependencies clean