CI fix

Author: MelbourneDeveloper

.github/workflows/ci.yml

@@ -17,28 +17,23 @@ jobs:
 
       - run: npm ci
 
-      - name: Format check
-        run: npm run format:check
+      - name: Format
+        run: make format
 
       - name: Lint
-        run: npm run lint
+        run: make lint
 
       - name: Spell check
-        uses: streetsidesoftware/cspell-action@v6
-        with:
-          files: "src/**/*.ts"
+        run: make spellcheck
 
       - name: Build
-        run: npm run compile
-
-      - name: Unit tests
-        run: npm run test:unit
+        run: make build
 
-      - name: E2E tests with coverage
-        run: xvfb-run -a npx vscode-test --coverage --grep @exclude-ci --invert
+      - name: Test
+        run: make test EXCLUDE_CI=true
 
-      - name: Coverage threshold (90%)
-        run: npm run coverage:check
+      - name: Package
+        run: make package
 
   website:
     runs-on: ubuntu-latest

Makefile

@@ -1,25 +1,37 @@
-.PHONY: format lint build package test test-exclude-ci ci
+.PHONY: format lint spellcheck build package test ci
 
 format:
 	npx prettier --write "src/**/*.ts"
 
 lint:
 	npx eslint src
 
+spellcheck:
+	npx cspell "src/**/*.ts"
+
 build:
 	npx tsc -p ./
 
 package: build
 	npx vsce package
 
-test: build
-	npm run test:unit
-	npx vscode-test --coverage
-	node tools/check-coverage.mjs
+UNAME := $(shell uname)
+EXCLUDE_CI ?= false
 
-test-exclude-ci: build
+VSCODE_TEST_CMD = npx vscode-test --coverage
+ifeq ($(EXCLUDE_CI),true)
+VSCODE_TEST_CMD += --grep @exclude-ci --invert
+endif
+
+ifeq ($(UNAME),Linux)
+VSCODE_TEST = xvfb-run -a $(VSCODE_TEST_CMD)
+else
+VSCODE_TEST = $(VSCODE_TEST_CMD)
+endif
+
+test: build
 	npm run test:unit
-	npx vscode-test --coverage --grep @exclude-ci --invert
+	$(VSCODE_TEST)
 	node tools/check-coverage.mjs
 
-ci: format lint build test package
+ci: format lint spellcheck build test package

cspell.json

@@ -71,6 +71,8 @@
         "visioncortex",
         "behaviour",
         "docstrings",
+        "golangci",
+        "gotestsum",
         "subproject"
     ]
 }