Skip to content

Commit 64b33b7

Browse files
committed
Update node version in CI
1 parent c189df3 commit 64b33b7

4 files changed

Lines changed: 21 additions & 10 deletions

File tree

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- uses: actions/setup-node@v1
2424
with:
25-
node-version: '14.14.0'
25+
node-version: '16.13.0'
2626

2727
- name: Install dependencies
2828
working-directory: extensions/ql-vscode
@@ -82,7 +82,7 @@ jobs:
8282

8383
- uses: actions/setup-node@v1
8484
with:
85-
node-version: '14.14.0'
85+
node-version: '16.13.0'
8686

8787
- name: Install dependencies
8888
working-directory: extensions/ql-vscode
@@ -147,7 +147,7 @@ jobs:
147147

148148
- uses: actions/setup-node@v1
149149
with:
150-
node-version: '14.14.0'
150+
node-version: '16.13.0'
151151

152152
- name: Install dependencies
153153
working-directory: extensions/ql-vscode

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- uses: actions/setup-node@v1
2424
with:
25-
node-version: '10.18.1'
25+
node-version: '16.13.0'
2626

2727
- name: Install dependencies
2828
run: |

extensions/ql-vscode/src/cli.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import { CancellationToken, Disposable, Uri } from 'vscode';
1313
import { BQRSInfo, DecodedBqrsChunk } from './pure/bqrs-cli-types';
1414
import { CliConfig } from './config';
1515
import { DistributionProvider, FindDistributionResultKind } from './distribution';
16-
import { assertNever, walkDirectory } from './pure/helpers-pure';
16+
import { assertNever } from './pure/helpers-pure';
1717
import { QueryMetadata, SortDirection } from './pure/interface-types';
1818
import { Logger, ProgressReporter } from './logging';
1919
import { CompilationMessage } from './pure/messages';
2020
import { sarifParser } from './sarif-parser';
21-
import { dbSchemeToLanguage } from './helpers';
21+
import { dbSchemeToLanguage, walkDirectory } from './helpers';
2222

2323
/**
2424
* The version of the SARIF format that we are using.

extensions/ql-vscode/src/vscode-tests/no-workspace/remote-query-history.test.ts

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { AnalysesResultsManager } from '../../remote-queries/analyses-results-ma
1717
import { RemoteQueryResult } from '../../remote-queries/shared/remote-query-result';
1818
import { DisposableBucket } from '../disposable-bucket';
1919
import { testDisposeHandler } from '../test-dispose-handler';
20-
import { walkDirectory } from '../../pure/helpers-pure';
20+
import { walkDirectory } from '../../helpers';
2121

2222
chai.use(chaiAsPromised);
2323
const expect = chai.expect;
@@ -41,13 +41,19 @@ describe('Remote queries and query history manager', function() {
4141
let showTextDocumentSpy: sinon.SinonSpy;
4242
let openTextDocumentSpy: sinon.SinonSpy;
4343

44-
beforeEach(async () => {
44+
beforeEach(async function() {
45+
46+
// set a higher timeout since recursive delete below may take a while, expecially on Windows.
47+
this.timeout(120000);
48+
4549
// Since these tests change the state of the query history manager, we need to copy the original
4650
// to a temporary folder where we can manipulate it for tests
4751
await copyHistoryState();
4852
});
4953

50-
afterEach(() => {
54+
afterEach(function() {
55+
// set a higher timeout since recursive delete below may take a while, expecially on Windows.
56+
this.timeout(120000);
5157
deleteHistoryState();
5258
});
5359

@@ -332,7 +338,12 @@ describe('Remote queries and query history manager', function() {
332338
}
333339

334340
function deleteHistoryState() {
335-
fs.removeSync(STORAGE_DIR);
341+
fs.rmSync(STORAGE_DIR, {
342+
recursive: true,
343+
force: true,
344+
maxRetries: 10,
345+
retryDelay: 100
346+
});
336347
}
337348

338349
function replacePlaceholder(filePath: string) {

0 commit comments

Comments
 (0)