From 8136328ad6494ba3319d55bea84765fa5002fac3 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 19 Sep 2023 10:11:55 +0100 Subject: [PATCH 1/3] Change node version to 18.15.0 --- .github/workflows/cli-test.yml | 2 +- .github/workflows/main.yml | 10 +++++----- .github/workflows/release.yml | 2 +- extensions/ql-vscode/.nvmrc | 2 +- extensions/ql-vscode/package-lock.json | 2 +- extensions/ql-vscode/package.json | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/cli-test.yml b/.github/workflows/cli-test.yml index db05ecf9ba2..fb8908d5cb2 100644 --- a/.github/workflows/cli-test.yml +++ b/.github/workflows/cli-test.yml @@ -62,7 +62,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 98a1b491355..ce947acd655 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json @@ -64,7 +64,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json @@ -113,7 +113,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json @@ -147,7 +147,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json @@ -215,7 +215,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aca4d563e84..964983b182f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.15.0' - name: Install dependencies run: | diff --git a/extensions/ql-vscode/.nvmrc b/extensions/ql-vscode/.nvmrc index e0325e5adb6..e048c8ca198 100644 --- a/extensions/ql-vscode/.nvmrc +++ b/extensions/ql-vscode/.nvmrc @@ -1 +1 @@ -v16.17.1 +v18.15.0 diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index 822341b677c..254a575c242 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -147,7 +147,7 @@ "webpack-cli": "^5.0.1" }, "engines": { - "node": "^16.17.1", + "node": "^18.15.0", "npm": ">=7.20.6", "vscode": "^1.67.0" } diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index 3262e5e0d69..ae27bec7203 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -14,7 +14,7 @@ }, "engines": { "vscode": "^1.67.0", - "node": "^16.17.1", + "node": "^18.15.0", "npm": ">=7.20.6" }, "categories": [ From 8d74933c70eb730fb450f7c3ec9aeae7f339f831 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 19 Sep 2023 10:12:04 +0100 Subject: [PATCH 2/3] v1.9.0 --- extensions/ql-vscode/CHANGELOG.md | 2 +- extensions/ql-vscode/package-lock.json | 4 ++-- extensions/ql-vscode/package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 6b4ea877d87..2d1cd407fdb 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -1,6 +1,6 @@ # CodeQL for Visual Studio Code: Changelog -## [UNRELEASED] +## 1.9.0 - 19 September 2023 - Release the [CodeQL model editor](https://codeql.github.com/docs/codeql/codeql-for-visual-studio-code/using-the-codeql-model-editor) to create CodeQL model packs for Java frameworks. Open the editor using the "CodeQL: Open CodeQL Model Editor (Beta)" command. [#2823](https://github.com/github/vscode-codeql/pull/2823) diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index 254a575c242..fd485a03120 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-codeql", - "version": "1.8.13", + "version": "1.9.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-codeql", - "version": "1.8.13", + "version": "1.9.0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index ae27bec7203..909d06a9502 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -4,7 +4,7 @@ "description": "CodeQL for Visual Studio Code", "author": "GitHub", "private": true, - "version": "1.8.13", + "version": "1.9.0", "publisher": "GitHub", "license": "MIT", "icon": "media/VS-marketplace-CodeQL-icon.png", From 26450e9236d6bd917679464f68c371794038a2f4 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 19 Sep 2023 11:37:25 +0100 Subject: [PATCH 3/3] Disable unit tests using MockGitHubApiServer --- .../variant-analysis/gh-api/gh-api-client.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts b/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts index b03b107cb93..f976d4bc105 100644 --- a/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts +++ b/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts @@ -21,7 +21,7 @@ const controllerRepoId = variantAnalysisJson_response.body.controller_repo.id; const variantAnalysisId = variantAnalysisJson_response.body.id; const repoTaskId = variantAnalysisRepoJson_response.body.repository.id; -describe("submitVariantAnalysis", () => { +describe.skip("submitVariantAnalysis", () => { it("returns the submitted variant analysis", async () => { await mockServer.loadScenario("mrva-problem-query-success"); @@ -35,7 +35,7 @@ describe("submitVariantAnalysis", () => { }); }); -describe("getVariantAnalysis", () => { +describe.skip("getVariantAnalysis", () => { it("returns the variant analysis", async () => { await mockServer.loadScenario("mrva-problem-query-success"); @@ -50,7 +50,7 @@ describe("getVariantAnalysis", () => { }); }); -describe("getVariantAnalysisRepo", () => { +describe.skip("getVariantAnalysisRepo", () => { it("returns the variant analysis repo task", async () => { await mockServer.loadScenario("mrva-problem-query-success"); @@ -66,7 +66,7 @@ describe("getVariantAnalysisRepo", () => { }); }); -describe("getRepositoryFromNwo", () => { +describe.skip("getRepositoryFromNwo", () => { it("returns the repository", async () => { await mockServer.loadScenario("mrva-problem-query-success");