From b419190c5943693dba521911db1bf79a7eae6158 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Jul 2025 00:18:48 +0000 Subject: [PATCH 1/6] Update supported GitHub Enterprise Server versions --- lib/api-compatibility.json | 2 +- src/api-compatibility.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/api-compatibility.json b/lib/api-compatibility.json index 6dabeea1c..58f645ff2 100644 --- a/lib/api-compatibility.json +++ b/lib/api-compatibility.json @@ -1 +1 @@ -{ "maximumVersion": "3.18", "minimumVersion": "3.13" } +{ "maximumVersion": "3.18", "minimumVersion": "3.14" } diff --git a/src/api-compatibility.json b/src/api-compatibility.json index efa09acf9..cb3dd14fa 100644 --- a/src/api-compatibility.json +++ b/src/api-compatibility.json @@ -1 +1 @@ -{"maximumVersion": "3.18", "minimumVersion": "3.13"} +{"maximumVersion": "3.18", "minimumVersion": "3.14"} From f67ceea75b3bc6ae104f5018d83cc9387139c0bf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Jul 2025 11:06:57 +0000 Subject: [PATCH 2/6] Update default bundle to codeql-bundle-v2.22.2 --- 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 7dff90930..d8d174e08 100644 --- a/lib/defaults.json +++ b/lib/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.22.1", - "cliVersion": "2.22.1", - "priorBundleVersion": "codeql-bundle-v2.22.0", - "priorCliVersion": "2.22.0" + "bundleVersion": "codeql-bundle-v2.22.2", + "cliVersion": "2.22.2", + "priorBundleVersion": "codeql-bundle-v2.22.1", + "priorCliVersion": "2.22.1" } diff --git a/src/defaults.json b/src/defaults.json index b99e6e688..b852db8c5 100644 --- a/src/defaults.json +++ b/src/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.22.1", - "cliVersion": "2.22.1", - "priorBundleVersion": "codeql-bundle-v2.22.0", - "priorCliVersion": "2.22.0" + "bundleVersion": "codeql-bundle-v2.22.2", + "cliVersion": "2.22.2", + "priorBundleVersion": "codeql-bundle-v2.22.1", + "priorCliVersion": "2.22.1" } From 0f549a757bc580de521f5eeb60578559b9c32485 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Jul 2025 11:07:01 +0000 Subject: [PATCH 3/6] Add changelog note --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc8ceef43..8e920cabe 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.22.2. [#2986](https://github.com/github/codeql-action/pull/2986) ## 3.29.2 - 30 Jun 2025 From eb90c18c83e31abc3821ad652459fd82229b8f48 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Tue, 29 Jul 2025 06:05:45 +0100 Subject: [PATCH 4/6] Update version constants --- lib/codeql.js | 6 +++--- src/codeql.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/codeql.js b/lib/codeql.js index fb347e5c6..3273a84bc 100644 --- a/lib/codeql.js +++ b/lib/codeql.js @@ -77,15 +77,15 @@ const CODEQL_MINIMUM_VERSION = "2.16.6"; /** * This version will shortly become the oldest version of CodeQL that the Action will run with. */ -const CODEQL_NEXT_MINIMUM_VERSION = "2.16.6"; +const CODEQL_NEXT_MINIMUM_VERSION = "2.17.6"; /** * This is the version of GHES that was most recently deprecated. */ -const GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.12"; +const GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.13"; /** * This is the deprecation date for the version of GHES that was most recently deprecated. */ -const GHES_MOST_RECENT_DEPRECATION_DATE = "2025-04-03"; +const GHES_MOST_RECENT_DEPRECATION_DATE = "2025-06-19"; /** The CLI verbosity level to use for extraction in debug mode. */ const EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++"; /* diff --git a/src/codeql.ts b/src/codeql.ts index 0cc917c22..c29afdaf5 100644 --- a/src/codeql.ts +++ b/src/codeql.ts @@ -290,17 +290,17 @@ const CODEQL_MINIMUM_VERSION = "2.16.6"; /** * This version will shortly become the oldest version of CodeQL that the Action will run with. */ -const CODEQL_NEXT_MINIMUM_VERSION = "2.16.6"; +const CODEQL_NEXT_MINIMUM_VERSION = "2.17.6"; /** * This is the version of GHES that was most recently deprecated. */ -const GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.12"; +const GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.13"; /** * This is the deprecation date for the version of GHES that was most recently deprecated. */ -const GHES_MOST_RECENT_DEPRECATION_DATE = "2025-04-03"; +const GHES_MOST_RECENT_DEPRECATION_DATE = "2025-06-19"; /** The CLI verbosity level to use for extraction in debug mode. */ const EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++"; From abbda19c1d5c93fdda3e4a8082499fe58f6367a2 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Tue, 29 Jul 2025 06:14:17 +0100 Subject: [PATCH 5/6] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3e6c09c39..90a388f67 100644 --- a/README.md +++ b/README.md @@ -70,11 +70,11 @@ We typically release new minor versions of the CodeQL Action and Bundle when a n | Minimum CodeQL Action | Minimum CodeQL Bundle Version | GitHub Environment | Notes | |-----------------------|-------------------------------|--------------------|-------| +| `v3.28.21` | `2.20.7` | Enterprise Server 3.18 | | | `v3.28.12` | `2.20.7` | Enterprise Server 3.17 | | | `v3.28.6` | `2.20.3` | Enterprise Server 3.16 | | | `v3.28.6` | `2.20.3` | Enterprise Server 3.15 | | | `v3.28.6` | `2.20.3` | Enterprise Server 3.14 | | -| `v3.28.6` | `2.20.3` | Enterprise Server 3.13 | | See the full list of GHES release and deprecation dates at [GitHub Enterprise Server releases](https://docs.github.com/en/enterprise-server/admin/all-releases#releases-of-github-enterprise-server). From 88d99b3033a0bf85100e352126839405db551ebb Mon Sep 17 00:00:00 2001 From: Chuan-kai Lin Date: Tue, 29 Jul 2025 09:14:16 -0700 Subject: [PATCH 6/6] Stop testing stable-v2.16.6 --- .github/workflows/__go-tracing-autobuilder.yml | 8 ++++---- .github/workflows/__go-tracing-custom-build-steps.yml | 8 ++++---- .github/workflows/__go-tracing-legacy-workflow.yml | 8 ++++---- .github/workflows/__multi-language-autodetect.yml | 8 ++++---- README.md | 2 +- pr-checks/sync.py | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index 85a9fae07..2c52eacac 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -27,10 +27,6 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-latest - version: stable-v2.16.6 - - os: macos-latest - version: stable-v2.16.6 - os: ubuntu-latest version: stable-v2.17.6 - os: macos-latest @@ -47,6 +43,10 @@ jobs: version: stable-v2.20.7 - os: macos-latest version: stable-v2.20.7 + - os: ubuntu-latest + version: stable-v2.21.4 + - os: macos-latest + version: stable-v2.21.4 - os: ubuntu-latest version: default - os: macos-latest diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index 02f1e1dac..4192af314 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -27,10 +27,6 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-latest - version: stable-v2.16.6 - - os: macos-latest - version: stable-v2.16.6 - os: ubuntu-latest version: stable-v2.17.6 - os: macos-latest @@ -47,6 +43,10 @@ jobs: version: stable-v2.20.7 - os: macos-latest version: stable-v2.20.7 + - os: ubuntu-latest + version: stable-v2.21.4 + - os: macos-latest + version: stable-v2.21.4 - os: ubuntu-latest version: default - os: macos-latest diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index b6049c158..bc748bf38 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -27,10 +27,6 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-latest - version: stable-v2.16.6 - - os: macos-latest - version: stable-v2.16.6 - os: ubuntu-latest version: stable-v2.17.6 - os: macos-latest @@ -47,6 +43,10 @@ jobs: version: stable-v2.20.7 - os: macos-latest version: stable-v2.20.7 + - os: ubuntu-latest + version: stable-v2.21.4 + - os: macos-latest + version: stable-v2.21.4 - os: ubuntu-latest version: default - os: macos-latest diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 2d8c93417..6847bc26e 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -27,10 +27,6 @@ jobs: fail-fast: false matrix: include: - - os: macos-latest - version: stable-v2.16.6 - - os: ubuntu-latest - version: stable-v2.16.6 - os: macos-latest version: stable-v2.17.6 - os: ubuntu-latest @@ -47,6 +43,10 @@ jobs: version: stable-v2.20.7 - os: ubuntu-latest version: stable-v2.20.7 + - os: macos-latest + version: stable-v2.21.4 + - os: ubuntu-latest + version: stable-v2.21.4 - os: macos-latest version: default - os: ubuntu-latest diff --git a/README.md b/README.md index 90a388f67..c5b8eab81 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ We typically release new minor versions of the CodeQL Action and Bundle when a n | Minimum CodeQL Action | Minimum CodeQL Bundle Version | GitHub Environment | Notes | |-----------------------|-------------------------------|--------------------|-------| -| `v3.28.21` | `2.20.7` | Enterprise Server 3.18 | | +| `v3.28.21` | `2.21.3` | Enterprise Server 3.18 | | | `v3.28.12` | `2.20.7` | Enterprise Server 3.17 | | | `v3.28.6` | `2.20.3` | Enterprise Server 3.16 | | | `v3.28.6` | `2.20.3` | Enterprise Server 3.15 | | diff --git a/pr-checks/sync.py b/pr-checks/sync.py index c8a2ff196..61ec0bb1c 100755 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -9,8 +9,6 @@ import os # The default set of CodeQL Bundle versions to use for the PR checks. defaultTestVersions = [ # The oldest supported CodeQL version. If bumping, update `CODEQL_MINIMUM_VERSION` in `codeql.ts` - "stable-v2.16.6", - # The last CodeQL release in the 2.17 series. "stable-v2.17.6", # The last CodeQL release in the 2.18 series. "stable-v2.18.4", @@ -18,6 +16,8 @@ defaultTestVersions = [ "stable-v2.19.4", # The last CodeQL release in the 2.20 series. "stable-v2.20.7", + # The last CodeQL release in the 2.21 series. + "stable-v2.21.4", # The default version of CodeQL for Dotcom, as determined by feature flags. "default", # The version of CodeQL shipped with the Action in `defaults.json`. During the release process