From 4b8aa3d6a5b427cbb2517793b35afd3dbb7a75f3 Mon Sep 17 00:00:00 2001 From: shati-patel <42641846+shati-patel@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:36:22 +0100 Subject: [PATCH 1/2] v1.8.12 --- .github/workflows/cli-test.yml | 2 +- .github/workflows/main.yml | 10 +++++----- .github/workflows/release.yml | 2 +- docs/releasing.md | 4 +++- extensions/ql-vscode/.nvmrc | 2 +- extensions/ql-vscode/CHANGELOG.md | 5 +++-- extensions/ql-vscode/package-lock.json | 2 +- extensions/ql-vscode/package.json | 2 +- 8 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cli-test.yml b/.github/workflows/cli-test.yml index 342c66f84dd..4ecbf2a4ac7 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 1b3acbbac29..dee73e5fdfb 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 72046c8cf80..e21d3e57547 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/docs/releasing.md b/docs/releasing.md index d300799a45f..1fe5cb564f7 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -13,9 +13,11 @@ * Accumulation of many changes, none of which are individually big enough to warrant a minor bump, but which together are. This does not include changes which are purely internal to the extension, such as refactoring, or which are only available behind a feature flag. 1. Double-check that the node version we're using matches the one used for VS Code. You can find this info by seleting "About Visual Studio Code" from the top menu. If it doesn't match, you will then need to update the node version in the following files: * `.nvmrc` - this will enable `nvm` to automatically switch to the correct node version when you're in the project folder + * `.github/workflows/cli-test.yml` - the "node-version: '[VERSION]'" setting * `.github/workflows/main.yml` - all the "node-version: '[VERSION]'" settings * `.github/workflows/release.yml` - the "node-version: '[VERSION]'" setting -1. Double-check that the extension `package.json` and `package-lock.json` have the version you intend to release. If you are doing a patch release (as opposed to minor or major version) this should already be correct. + * `package.json`and `package-lock.json` - the "engines" setting +1. Double-check that the extension `package.json` and `package-lock.json` have the extension version you intend to release. If you are doing a patch release (as opposed to minor or major version) this should already be correct. 1. Create a PR for this release: * This PR will contain any missing bits from steps 1, 2 and 3. Most of the time, this will just be updating `CHANGELOG.md` with today's date. * Create a new branch for the release named after the new version. For example: `v1.3.6` 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/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index a9de9577bb5..54bd4f6249a 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -1,13 +1,14 @@ # CodeQL for Visual Studio Code: Changelog -## [UNRELEASED] +## 1.8.12 - 11 September 2023 + +- Fix a bug where variant analysis queries would fail for queries in the `codeql/java-queries` query pack. [#2786](https://github.com/github/vscode-codeql/pull/2786) ## 1.8.11 - 7 September 2023 - Update how variant analysis results are displayed. For queries with ["path-problem" or "problem" `@kind`](https://codeql.github.com/docs/writing-codeql-queries/metadata-for-codeql-queries/#metadata-properties), you can choose to display the results as rendered alerts or as a table of raw results. For queries with any other `@kind`, the results are displayed as a table. [#2745](https://github.com/github/vscode-codeql/pull/2745) & [#2749](https://github.com/github/vscode-codeql/pull/2749) - When running variant analyses, don't download artifacts for repositories with no results. [#2736](https://github.com/github/vscode-codeql/pull/2736) - Group the extension settings, so that they're easier to find in the Settings UI. [#2706](https://github.com/github/vscode-codeql/pull/2706) -- Fix a bug where variant analysis queries would fail for queries in the `codeql/java-queries` query pack. [#2786](https://github.com/github/vscode-codeql/pull/2786) ## 1.8.10 - 15 August 2023 diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index 85578b5ac4f..d52487699ee 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 94ccfc747f8..52eb2f5140f 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 07172de0b080885324334ed456fa579751d6b01d Mon Sep 17 00:00:00 2001 From: shati-patel <42641846+shati-patel@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:52:31 +0100 Subject: [PATCH 2/2] Don't update the node version yet --- .github/workflows/cli-test.yml | 2 +- .github/workflows/main.yml | 10 +++++----- .github/workflows/release.yml | 2 +- docs/releasing.md | 4 +--- extensions/ql-vscode/.nvmrc | 2 +- extensions/ql-vscode/package-lock.json | 2 +- extensions/ql-vscode/package.json | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cli-test.yml b/.github/workflows/cli-test.yml index 4ecbf2a4ac7..342c66f84dd 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: '18.15.0' + node-version: '16.17.1' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dee73e5fdfb..1b3acbbac29 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '18.15.0' + node-version: '16.17.1' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json @@ -64,7 +64,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '18.15.0' + node-version: '16.17.1' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json @@ -113,7 +113,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '18.15.0' + node-version: '16.17.1' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json @@ -147,7 +147,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '18.15.0' + node-version: '16.17.1' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json @@ -215,7 +215,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '18.15.0' + node-version: '16.17.1' cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e21d3e57547..72046c8cf80 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '18.15.0' + node-version: '16.17.1' - name: Install dependencies run: | diff --git a/docs/releasing.md b/docs/releasing.md index 1fe5cb564f7..d300799a45f 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -13,11 +13,9 @@ * Accumulation of many changes, none of which are individually big enough to warrant a minor bump, but which together are. This does not include changes which are purely internal to the extension, such as refactoring, or which are only available behind a feature flag. 1. Double-check that the node version we're using matches the one used for VS Code. You can find this info by seleting "About Visual Studio Code" from the top menu. If it doesn't match, you will then need to update the node version in the following files: * `.nvmrc` - this will enable `nvm` to automatically switch to the correct node version when you're in the project folder - * `.github/workflows/cli-test.yml` - the "node-version: '[VERSION]'" setting * `.github/workflows/main.yml` - all the "node-version: '[VERSION]'" settings * `.github/workflows/release.yml` - the "node-version: '[VERSION]'" setting - * `package.json`and `package-lock.json` - the "engines" setting -1. Double-check that the extension `package.json` and `package-lock.json` have the extension version you intend to release. If you are doing a patch release (as opposed to minor or major version) this should already be correct. +1. Double-check that the extension `package.json` and `package-lock.json` have the version you intend to release. If you are doing a patch release (as opposed to minor or major version) this should already be correct. 1. Create a PR for this release: * This PR will contain any missing bits from steps 1, 2 and 3. Most of the time, this will just be updating `CHANGELOG.md` with today's date. * Create a new branch for the release named after the new version. For example: `v1.3.6` diff --git a/extensions/ql-vscode/.nvmrc b/extensions/ql-vscode/.nvmrc index e048c8ca198..e0325e5adb6 100644 --- a/extensions/ql-vscode/.nvmrc +++ b/extensions/ql-vscode/.nvmrc @@ -1 +1 @@ -v18.15.0 +v16.17.1 diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index d52487699ee..85578b5ac4f 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": "^18.15.0", + "node": "^16.17.1", "npm": ">=7.20.6", "vscode": "^1.67.0" } diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index 52eb2f5140f..94ccfc747f8 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -14,7 +14,7 @@ }, "engines": { "vscode": "^1.67.0", - "node": "^18.15.0", + "node": "^16.17.1", "npm": ">=7.20.6" }, "categories": [