From 70c4c0fc21ba0510cff513c9990b95f1b9fafd4f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 16:39:21 +0000 Subject: [PATCH 1/6] Update changelog and version after v2.21.6 --- CHANGELOG.md | 4 ++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6abd3cec50..c08c24bf4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs. +## [UNRELEASED] + +No user facing changes. + ## 2.21.6 - 13 Sep 2023 - Better error message when there is a failure to determine the merge base of the code to analysis. [#1860](https://github.com/github/codeql-action/pull/1860) diff --git a/package-lock.json b/package-lock.json index debb05d892..7a5df52fd9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "codeql", - "version": "2.21.6", + "version": "2.21.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "codeql", - "version": "2.21.6", + "version": "2.21.7", "license": "MIT", "dependencies": { "@actions/artifact": "^1.1.1", diff --git a/package.json b/package.json index a31d31e3d5..7e1f4d7be3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codeql", - "version": "2.21.6", + "version": "2.21.7", "private": true, "description": "CodeQL action", "scripts": { From f664957aa4b98b38c4448412ea067dd44226eb11 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 16:41:51 +0000 Subject: [PATCH 2/6] Update checked-in dependencies --- node_modules/.package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index c21d362cc9..3b5c241402 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,6 +1,6 @@ { "name": "codeql", - "version": "2.21.6", + "version": "2.21.7", "lockfileVersion": 3, "requires": true, "packages": { From 77a54b68d4e0a1abcf8eaa9b01226c7cc5c4a263 Mon Sep 17 00:00:00 2001 From: Chuan-kai Lin Date: Wed, 13 Sep 2023 09:49:02 -0700 Subject: [PATCH 3/6] Remove --pr in update-dependencies.yml --- .github/workflows/update-dependencies.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index c7cf93196d..594a9f44e1 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -36,6 +36,6 @@ jobs: git push origin "HEAD:$BRANCH" echo "Pushed a commit to update the checked-in dependencies." \ "Please mark the PR as ready for review to trigger PR checks." | - gh pr comment --body-file - --repo github/codeql-action --pr "${{ github.event.pull_request.number }}" - gh pr ready --undo --repo github/codeql-action --pr "${{ github.event.pull_request.number }}" + gh pr comment --body-file - --repo github/codeql-action "${{ github.event.pull_request.number }}" + gh pr ready --undo --repo github/codeql-action "${{ github.event.pull_request.number }}" fi From 71c7e828375855dbe36c98961b7a42392c16a923 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 14:29:25 +0000 Subject: [PATCH 4/6] Update default bundle to codeql-bundle-v2.14.5 --- lib/defaults.json | 8 ++++---- src/defaults.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/defaults.json b/lib/defaults.json index 8a520c762d..e41a9d8260 100644 --- a/lib/defaults.json +++ b/lib/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.14.4", - "cliVersion": "2.14.4", - "priorBundleVersion": "codeql-bundle-v2.14.3", - "priorCliVersion": "2.14.3" + "bundleVersion": "codeql-bundle-v2.14.5", + "cliVersion": "2.14.5", + "priorBundleVersion": "codeql-bundle-v2.14.4", + "priorCliVersion": "2.14.4" } diff --git a/src/defaults.json b/src/defaults.json index 0006047097..0b484be707 100644 --- a/src/defaults.json +++ b/src/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.14.4", - "cliVersion": "2.14.4", - "priorBundleVersion": "codeql-bundle-v2.14.3", - "priorCliVersion": "2.14.3" + "bundleVersion": "codeql-bundle-v2.14.5", + "cliVersion": "2.14.5", + "priorBundleVersion": "codeql-bundle-v2.14.4", + "priorCliVersion": "2.14.4" } From 19c02a4d1626c79fd7acd49feaae83500e8183c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 14:29:33 +0000 Subject: [PATCH 5/6] Add changelog note --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c08c24bf4a..9c04d3b6ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th ## [UNRELEASED] -No user facing changes. +- Update default CodeQL bundle version to 2.14.5. [#1882](https://github.com/github/codeql-action/pull/1882) ## 2.21.6 - 13 Sep 2023 From bb3bc25861a8d1de89538da0274224f03647ad26 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 16:10:20 +0000 Subject: [PATCH 6/6] Update changelog for v2.21.7 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c04d3b6ab..6ceb354577 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs. -## [UNRELEASED] +## 2.21.7 - 14 Sep 2023 - Update default CodeQL bundle version to 2.14.5. [#1882](https://github.com/github/codeql-action/pull/1882)