From 18ac79e766760e675ee0af0bf3ae0e92e6262899 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 17:18:51 +0000 Subject: [PATCH 1/6] Update changelog for v3.26.1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2416890f7d..259f9ef0bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. For example `3.22.11` was the first `v3` release and is functionally identical to `2.22.11`. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers. -## [UNRELEASED] +## 3.26.1 - 13 Aug 2024 - Update default CodeQL bundle version to 2.18.2. [#2417](https://github.com/github/codeql-action/pull/2417) From 5b15b9edebe00db5747d988e9a8ffe6835a3ba1c Mon Sep 17 00:00:00 2001 From: Remco Vermeulen Date: Tue, 13 Aug 2024 11:22:12 -0700 Subject: [PATCH 2/6] Revert "Merge pull request #2417 from github/update-bundle/codeql-bundle-v2.18.2" This reverts commit c4c3c4421f30858dc2e509489f5f6f3b86940613, reversing changes made to d620faa0b4e283b6884bb77fbe9f3ad4183b44a3. --- CHANGELOG.md | 2 +- lib/defaults.json | 8 ++++---- src/defaults.json | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 259f9ef0bd..1522b2137e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the ## 3.26.1 - 13 Aug 2024 -- Update default CodeQL bundle version to 2.18.2. [#2417](https://github.com/github/codeql-action/pull/2417) +No user facing changes. ## 3.26.0 - 06 Aug 2024 diff --git a/lib/defaults.json b/lib/defaults.json index 29638bb159..a58063be26 100644 --- a/lib/defaults.json +++ b/lib/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.18.2", - "cliVersion": "2.18.2", - "priorBundleVersion": "codeql-bundle-v2.18.1", - "priorCliVersion": "2.18.1" + "bundleVersion": "codeql-bundle-v2.18.1", + "cliVersion": "2.18.1", + "priorBundleVersion": "codeql-bundle-v2.18.0", + "priorCliVersion": "2.18.0" } diff --git a/src/defaults.json b/src/defaults.json index 5c63e93bc9..8503bea5b3 100644 --- a/src/defaults.json +++ b/src/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.18.2", - "cliVersion": "2.18.2", - "priorBundleVersion": "codeql-bundle-v2.18.1", - "priorCliVersion": "2.18.1" + "bundleVersion": "codeql-bundle-v2.18.1", + "cliVersion": "2.18.1", + "priorBundleVersion": "codeql-bundle-v2.18.0", + "priorCliVersion": "2.18.0" } From ece28a826ba523c14d061d28f1c00789007ff9cd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 20:33:30 +0000 Subject: [PATCH 3/6] Update changelog and version after v3.26.1 --- 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 1522b2137e..471ca56d20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. For example `3.22.11` was the first `v3` release and is functionally identical to `2.22.11`. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers. +## [UNRELEASED] + +No user facing changes. + ## 3.26.1 - 13 Aug 2024 No user facing changes. diff --git a/package-lock.json b/package-lock.json index 6c9f4448c3..7c2c04f5d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "codeql", - "version": "3.26.1", + "version": "3.26.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "codeql", - "version": "3.26.1", + "version": "3.26.2", "license": "MIT", "dependencies": { "@actions/artifact": "^1.1.2", diff --git a/package.json b/package.json index 414cbd2e4a..4d818ce535 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codeql", - "version": "3.26.1", + "version": "3.26.2", "private": true, "description": "CodeQL action", "scripts": { From dd9700c1669f4ea140e836695866a3f518904983 Mon Sep 17 00:00:00 2001 From: Remco Vermeulen Date: Tue, 13 Aug 2024 13:49:54 -0700 Subject: [PATCH 4/6] Reapply "Merge pull request #2417 from github/update-bundle/codeql-bundle-v2.18.2" This reverts commit 5b15b9edebe00db5747d988e9a8ffe6835a3ba1c. --- CHANGELOG.md | 2 +- lib/defaults.json | 8 ++++---- src/defaults.json | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 471ca56d20..b3c31f1ac9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ No user facing changes. ## 3.26.1 - 13 Aug 2024 -No user facing changes. +- Update default CodeQL bundle version to 2.18.2. [#2417](https://github.com/github/codeql-action/pull/2417) ## 3.26.0 - 06 Aug 2024 diff --git a/lib/defaults.json b/lib/defaults.json index a58063be26..29638bb159 100644 --- a/lib/defaults.json +++ b/lib/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.18.1", - "cliVersion": "2.18.1", - "priorBundleVersion": "codeql-bundle-v2.18.0", - "priorCliVersion": "2.18.0" + "bundleVersion": "codeql-bundle-v2.18.2", + "cliVersion": "2.18.2", + "priorBundleVersion": "codeql-bundle-v2.18.1", + "priorCliVersion": "2.18.1" } diff --git a/src/defaults.json b/src/defaults.json index 8503bea5b3..5c63e93bc9 100644 --- a/src/defaults.json +++ b/src/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.18.1", - "cliVersion": "2.18.1", - "priorBundleVersion": "codeql-bundle-v2.18.0", - "priorCliVersion": "2.18.0" + "bundleVersion": "codeql-bundle-v2.18.2", + "cliVersion": "2.18.2", + "priorBundleVersion": "codeql-bundle-v2.18.1", + "priorCliVersion": "2.18.1" } From 2bc3b8381e2706644af8c1361bf7d4341c0ccc55 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 20:52:52 +0000 Subject: [PATCH 5/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 5033fca0d6..aaded43f84 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,6 +1,6 @@ { "name": "codeql", - "version": "3.26.1", + "version": "3.26.2", "lockfileVersion": 3, "requires": true, "packages": { From af1f2e89e3fe28c6795170b69f9f55c0f1f87910 Mon Sep 17 00:00:00 2001 From: Remco Vermeulen Date: Wed, 14 Aug 2024 08:30:08 -0700 Subject: [PATCH 6/6] Address incorrect CHANGELOG.md The bundle update was removed from 3.26.1 and but back for the next release. Co-authored-by: Henry Mercer --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3c31f1ac9..05e5377a06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,11 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the ## [UNRELEASED] -No user facing changes. +- Update default CodeQL bundle version to 2.18.2. [#2417](https://github.com/github/codeql-action/pull/2417) ## 3.26.1 - 13 Aug 2024 -- Update default CodeQL bundle version to 2.18.2. [#2417](https://github.com/github/codeql-action/pull/2417) +No user facing changes. ## 3.26.0 - 06 Aug 2024