Merge pull request #30 from denco/feature/run-script-os

feature/run script os

Author: denco

.github/workflows/ci.yml

@@ -26,9 +26,5 @@ jobs:
       run: npm ci
     - name: Run Linting Checks
       run: npm run lint
-    - name: Run Headless Tests
-      run: xvfb-run --auto-servernum npm run test
-      if: runner.os == 'Linux'
     - name: Run Tests
       run: npm run test
-      if: runner.os != 'Linux'

npm-shrinkwrap.json

@@ -126,7 +126,9 @@
 		"watch": "tsc -watch -p ./",
 		"pretest": "npm run clean && npm run compile",
 		"lint": "eslint --cache=true --ext ts,tsx .",
-		"test": "node ./out/test/runTest.js",
+		"test": "run-script-os",
+		"test:linux": "which xvfb-run >/dev/null 2>&1 && xvfb-run --auto-servernum node ./out/test/runTest.js || npm run test:default",
+		"test:default": "node ./out/test/runTest.js",
 		"prepackage": "npm run clean && npm run compile",
 		"package": "vsce package",
 		"clean": "rimraf -rf ./out",
@@ -145,6 +147,7 @@
 		"mocha": "^8.3.2",
 		"ovsx": "^0.1.0-next.a9154dc",
 		"rimraf": "^3.0.2",
+		"run-script-os": "^1.1.5",
 		"source-map-support": "^0.5.12",
 		"typescript": "^4.2.3",
 		"vsce": "^1.66.0",
@@ -176,4 +179,4 @@
 	"__metadata": {
 		"publisherDisplayName": "denco"
 	}
-}
+}