From a59c1a0af08e6309319fbc07e5f896fa155ece58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Wed, 1 Dec 2021 12:22:34 +0200 Subject: [PATCH 1/4] Try to fix Code tests --- editors/code/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editors/code/package.json b/editors/code/package.json index 52ba1327459d..d10cea82374f 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": { From df4d55bdead407e757ab7a56f09fbfe5735f570f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Wed, 1 Dec 2021 12:52:24 +0200 Subject: [PATCH 2/4] Bump xvfb-action to fix Code tests --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f781e0987a27..319c56f96d72 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -125,12 +125,12 @@ jobs: working-directory: ./editors/code - name: Run vscode tests - uses: GabrielBB/xvfb-action@v1.2 + uses: GabrielBB/xvfb-action@v1.6 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: npm test + working-directory: ./editors/code - run: npm run pretest working-directory: ./editors/code From 5b7ffad924f21781b2334ed3a7bc915b378d16a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Wed, 1 Dec 2021 13:07:12 +0200 Subject: [PATCH 3/4] Use xvfb-run directly --- .github/workflows/ci.yaml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 319c56f96d72..e37608ebbf81 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -114,6 +114,10 @@ jobs: with: node-version: 12.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/xvfb-action@v1.6 + - name: Run VS Code tests (Linux) + if: matrix.os == 'ubuntu-latest' env: VSCODE_CLI: 1 - with: - run: npm test - working-directory: ./editors/code + 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 From b91003222b5420a41bdc343ce3a514ab7f59da6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Wed, 1 Dec 2021 13:09:43 +0200 Subject: [PATCH 4/4] Bump to Node 14 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e37608ebbf81..192ef11be37a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -112,7 +112,7 @@ 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'