diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index 85a9fae079..2c52eacac2 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 02f1e1dac9..4192af3144 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 b6049c158d..bc748bf384 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 2d8c934173..6847bc26e7 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 3e6c09c396..c5b8eab811 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.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 | | | `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). diff --git a/lib/api-compatibility.json b/lib/api-compatibility.json index 6dabeea1ca..58f645ff2b 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/lib/codeql.js b/lib/codeql.js index 78ec201442..314be3f2aa 100644 --- a/lib/codeql.js +++ b/lib/codeql.js @@ -78,15 +78,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/pr-checks/sync.py b/pr-checks/sync.py index c8a2ff196f..61ec0bb1c5 100755 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -9,8 +9,6 @@ # 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 @@ "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 diff --git a/src/api-compatibility.json b/src/api-compatibility.json index efa09acf97..cb3dd14fae 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"} diff --git a/src/codeql.ts b/src/codeql.ts index 7d82af72a0..057225418a 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++";