Unnamed repository; edit this file 'description' to name the repository.
-rw-r--r--.github/workflows/ci.yaml22
-rw-r--r--editors/code/package.json2
2 files changed, 17 insertions, 7 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f781e0987a..192ef11be3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -112,7 +112,11 @@ jobs:
- name: Install Nodejs
uses: actions/setup-node@v1
with:
- node-version: 12.x
+ node-version: 14.x
+
+ - name: Install xvfb
+ if: matrix.os == 'ubuntu-latest'
+ run: sudo apt-get install -y xvfb
- run: npm ci
working-directory: ./editors/code
@@ -124,13 +128,19 @@ jobs:
- run: npm run lint
working-directory: ./editors/code
- - name: Run vscode tests
- uses: GabrielBB/[email protected]
+ - name: Run VS Code tests (Linux)
+ if: matrix.os == 'ubuntu-latest'
env:
VSCODE_CLI: 1
- with:
- run: npm --prefix ./editors/code test
- # working-directory: ./editors/code # does not work: https://github.com/GabrielBB/xvfb-action/issues/8
+ run: xvfb-run npm test
+ working-directory: ./editors/code
+
+ - name: Run VS Code tests (Windows)
+ if: matrix.os == 'windows-latest'
+ env:
+ VSCODE_CLI: 1
+ run: npm test
+ working-directory: ./editors/code
- run: npm run pretest
working-directory: ./editors/code
diff --git a/editors/code/package.json b/editors/code/package.json
index 52ba132745..d10cea8237 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -32,7 +32,7 @@
"watch": "npm run build-base -- --sourcemap --watch",
"lint": "tsfmt --verify && eslint -c .eslintrc.js --ext ts ./src ./tests",
"fix": " tsfmt -r && eslint -c .eslintrc.js --ext ts ./src ./tests --fix",
- "pretest": "tsc --noEmit && npm run build",
+ "pretest": "tsc && npm run build",
"test": "node ./out/tests/runTests.js"
},
"dependencies": {