Skip to content

Commit d8f8eca

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/npm-61c837125e
2 parents 34cb19c + 562042d commit d8f8eca

20 files changed

+47
-55
lines changed

.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-indirect-tracing-workaround-no-file-program.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-indirect-tracing-workaround.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-tracing-autobuilder.yml

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-tracing-custom-build-steps.yml

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-tracing-legacy-workflow.yml

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__multi-language-autodetect.yml

+8-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/debug-artifacts.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
version:
25-
- stable-v2.14.6
2625
- stable-v2.15.5
2726
- stable-v2.16.6
2827
- stable-v2.17.6
2928
- stable-v2.18.4
29+
- stable-v2.19.4
3030
- default
3131
- linked
3232
- nightly-latest
@@ -71,7 +71,7 @@ jobs:
7171
- name: Check expected artifacts exist
7272
shell: bash
7373
run: |
74-
VERSIONS="stable-v2.14.6 stable-v2.15.5 stable-v2.16.6 stable-v2.17.6 stable-v2.18.4 default linked nightly-latest"
74+
VERSIONS="stable-v2.15.5 stable-v2.16.6 stable-v2.17.6 stable-v2.18.4 stable-v2.19.4 default linked nightly-latest"
7575
LANGUAGES="cpp csharp go java javascript python"
7676
for version in $VERSIONS; do
7777
pushd "./my-debug-artifacts-${version//./}"

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the
66

77
## [UNRELEASED]
88

9-
No user facing changes.
9+
- Bump the minimum CodeQL bundle version to 2.15.5. [#2655](https://github.com/github/codeql-action/pull/2655)
1010

1111
## 3.27.9 - 12 Dec 2024
1212

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,8 @@ We typically release new minor versions of the CodeQL Action and Bundle when a n
8181
| `v3.25.11` | `2.17.6` | Enterprise Server 3.14 | |
8282
| `v3.24.11` | `2.16.6` | Enterprise Server 3.13 | |
8383
| `v3.22.12` | `2.15.5` | Enterprise Server 3.12 | |
84-
| `v2.22.1` | `2.14.6` | Enterprise Server 3.11 | Supports CodeQL Action v3, but did not ship with CodeQL Action v3. For more information, see "[Code scanning: deprecation of CodeQL Action v2](https://github.blog/changelog/2024-01-12-code-scanning-deprecation-of-codeql-action-v2/#users-of-github-enterprise-server-311)." |
8584

86-
CodeQL Action v2 will stop receiving updates when GHES 3.11 is deprecated.
85+
CodeQL Action v2 has stopped receiving updates now that GHES 3.11 is deprecated.
8786

8887
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).
8988

lib/codeql.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeql",
3-
"version": "3.27.10",
3+
"version": "3.28.0",
44
"private": true,
55
"description": "CodeQL action",
66
"scripts": {

pr-checks/checks/go-indirect-tracing-workaround-diagnostic.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "Checks that we emit a diagnostic if Go is changed after the init s
33
# only Linux is affected
44
operatingSystems: ["ubuntu"]
55
# pinned to a version which does not support statically linked binaries for indirect tracing
6-
versions: ["stable-v2.14.6"]
6+
versions: ["default"]
77
steps:
88
- uses: actions/setup-go@v5
99
with:

pr-checks/checks/go-indirect-tracing-workaround-no-file-program.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "Checks that we emit a diagnostic if the `file` program is not inst
33
# only Linux is affected
44
operatingSystems: ["ubuntu"]
55
# pinned to a version which does not support statically linked binaries for indirect tracing
6-
versions: ["stable-v2.14.6"]
6+
versions: ["default"]
77
steps:
88
- uses: actions/setup-go@v5
99
with:

pr-checks/checks/go-indirect-tracing-workaround.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "Checks that our workaround for indirect tracing for Go 1.21+ on Li
33
# only Linux is affected
44
operatingSystems: ["ubuntu"]
55
# pinned to a version which does not support statically linked binaries for indirect tracing
6-
versions: ["stable-v2.14.6"]
6+
versions: ["default"]
77
steps:
88
- uses: actions/setup-go@v5
99
with:

pr-checks/checks/multi-language-autodetect.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ steps:
1010
id: init
1111
with:
1212
db-location: "${{ runner.temp }}/customDbLocation"
13-
# Swift is not supported on Ubuntu or codeql 2.14 so we manually exclude it from the list here
14-
languages: ${{ (runner.os == 'Linux' || (runner.os == 'macOS' && matrix.version == 'stable-v2.14.6')) && 'cpp,csharp,go,java,javascript,python,ruby' || '' }}
13+
languages: ${{ runner.os == 'Linux' && 'cpp,csharp,go,java,javascript,python,ruby' || '' }}
1514
tools: ${{ steps.prepare-test.outputs.tools-url }}
1615

1716
- uses: ./../action/.github/actions/setup-swift
18-
# Exclude macos on v2.14.6 since we can not longer run swift on ARM runners
19-
if: runner.os == 'macOS' && matrix.version != 'stable-v2.14.6'
17+
if: runner.os == 'macOS'
2018
with:
2119
codeql-path: ${{ steps.init.outputs.codeql-path }}
2220

@@ -69,8 +67,7 @@ steps:
6967
fi
7068
7169
- name: Check language autodetect for Swift on macOS
72-
# Exclude macos on v2.14.6 since we can not longer run swift on ARM runners
73-
if: runner.os == 'macOS' && matrix.version != 'stable-v2.14.6'
70+
if: runner.os == 'macOS'
7471
shell: bash
7572
run: |
7673
SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }}

pr-checks/sync.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
# The default set of CodeQL Bundle versions to use for the PR checks.
1010
defaultTestVersions = [
1111
# The oldest supported CodeQL version. If bumping, update `CODEQL_MINIMUM_VERSION` in `codeql.ts`
12-
"stable-v2.14.6",
13-
# The last CodeQL release in the 2.15 series.
1412
"stable-v2.15.5",
1513
# The last CodeQL release in the 2.16 series.
1614
"stable-v2.16.6",
1715
# The last CodeQL release in the 2.17 series.
1816
"stable-v2.17.6",
1917
# The last CodeQL release in the 2.18 series.
2018
"stable-v2.18.4",
19+
# The last CodeQL release in the 2.19 series.
20+
"stable-v2.19.4",
2121
# The default version of CodeQL for Dotcom, as determined by feature flags.
2222
"default",
2323
# The version of CodeQL shipped with the Action in `defaults.json`. During the release process

src/codeql.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -276,22 +276,22 @@ let cachedCodeQL: CodeQL | undefined = undefined;
276276
* The version flags below can be used to conditionally enable certain features
277277
* on versions newer than this.
278278
*/
279-
const CODEQL_MINIMUM_VERSION = "2.14.6";
279+
const CODEQL_MINIMUM_VERSION = "2.15.5";
280280

281281
/**
282282
* This version will shortly become the oldest version of CodeQL that the Action will run with.
283283
*/
284-
const CODEQL_NEXT_MINIMUM_VERSION = "2.14.6";
284+
const CODEQL_NEXT_MINIMUM_VERSION = "2.15.5";
285285

286286
/**
287287
* This is the version of GHES that was most recently deprecated.
288288
*/
289-
const GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.10";
289+
const GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.11";
290290

291291
/**
292292
* This is the deprecation date for the version of GHES that was most recently deprecated.
293293
*/
294-
const GHES_MOST_RECENT_DEPRECATION_DATE = "2024-09-24";
294+
const GHES_MOST_RECENT_DEPRECATION_DATE = "2024-12-19";
295295

296296
/** The CLI verbosity level to use for extraction in debug mode. */
297297
const EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++";

0 commit comments

Comments
 (0)