Skip to content

Commit 2c0b69b

Browse files
authored
Merge branch 'main' into dbartol/bundle-pr-description
2 parents 9a1f461 + b46ca8c commit 2c0b69b

16 files changed

+45
-74
lines changed

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

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

.github/workflows/__scaling-reserved-ram.yml

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

.github/workflows/__swift-custom-build.yml

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

.github/workflows/__unset-environment.yml

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

.github/workflows/debug-artifacts.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
version:
28-
- stable-20230403
29-
- stable-v2.13.5
30-
- stable-v2.14.6
28+
# TODO: Once CLI v2.17.4 is available and the platform is switched back to ubuntu,
29+
# stable-20230403, stable-v2.13.5, and stable-v2.14.6 can be added back to this matrix,
30+
# and the VERSIONS variable in the bash script below.
31+
# Prior to CLI v2.15.1, ARM runners were not supported by the build tracer.
3132
- stable-v2.15.5
3233
- stable-v2.16.6
3334
- default
@@ -37,7 +38,7 @@ jobs:
3738
env:
3839
CODEQL_ACTION_TEST_MODE: true
3940
timeout-minutes: 45
40-
runs-on: ubuntu-latest
41+
runs-on: macos-latest # TODO: Switch back to ubuntu for `nightly-latest` and `latest` once CLI v2.17.4 is available.
4142
steps:
4243
- name: Check out repository
4344
uses: actions/checkout@v4
@@ -75,7 +76,7 @@ jobs:
7576
- name: Check expected artifacts exist
7677
shell: bash
7778
run: |
78-
VERSIONS="stable-20230403 stable-v2.13.5 stable-v2.14.6 stable-v2.15.5 stable-v2.16.6 default latest nightly-latest"
79+
VERSIONS="stable-v2.15.5 stable-v2.16.6 default latest nightly-latest"
7980
LANGUAGES="cpp csharp go java javascript python"
8081
for version in $VERSIONS; do
8182
pushd "./my-debug-artifacts-${version//./}"

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the
88

99
No user facing changes.
1010

11+
## 3.25.6 - 20 May 2024
12+
13+
- Update default CodeQL bundle version to 2.17.3. [#2295](https://github.com/github/codeql-action/pull/2295)
14+
1115
## 3.25.5 - 13 May 2024
1216

1317
- Add a compatibility matrix of supported CodeQL Action, CodeQL CLI, and GitHub Enterprise Server versions to the [README.md](README.md). [#2273](https://github.com/github/codeql-action/pull/2273)

init/action.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ inputs:
3636
- `none`: The database will be created without building the source code.
3737
Available for all interpreted languages and some compiled languages.
3838
- `autobuild`: The database will be created by attempting to automatically build the source
39-
code.
40-
To use this build mode, ensure that your workflow calls the `autobuild` action
41-
between the `init` and `analyze` steps.
42-
Available for all compiled languages.
39+
code. Available for all compiled languages.
4340
- `manual`: The database will be created by building the source code using a manually
4441
specified build command. To use this build mode, specify manual build steps in
4542
your workflow between the `init` and `analyze` steps. Available for all

lib/defaults.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"bundleVersion": "codeql-bundle-v2.17.2",
3-
"cliVersion": "2.17.2",
4-
"priorBundleVersion": "codeql-bundle-v2.17.1",
5-
"priorCliVersion": "2.17.1"
2+
"bundleVersion": "codeql-bundle-v2.17.3",
3+
"cliVersion": "2.17.3",
4+
"priorBundleVersion": "codeql-bundle-v2.17.2",
5+
"priorCliVersion": "2.17.2"
66
}

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.25.6",
3+
"version": "3.25.7",
44
"private": true,
55
"description": "CodeQL action",
66
"scripts": {

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: "Multi-language repository"
22
description: "An end-to-end integration test of a multi-language repository using automatic language detection"
3-
operatingSystems: ["ubuntu", "macos"]
3+
# TODO: Add ubuntu back for `nightly-latest` and `latest` once CLI v2.17.4 is available.
4+
operatingSystems: ["macos"]
45
steps:
56
- uses: actions/setup-go@v5
67
with:

pr-checks/checks/scaling-reserved-ram.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: "Scaling reserved RAM"
22
description: "An end-to-end integration test of a multi-language repository with the scaling_reserved_ram feature flag enabled"
3-
operatingSystems: ["ubuntu", "macos"]
3+
# TODO: Add ubuntu back for `nightly-latest` and `latest` once CLI v2.17.4 is available.
4+
operatingSystems: ["macos"]
45
env:
56
CODEQL_ACTION_SCALING_RESERVED_RAM: true
67
steps:

pr-checks/checks/swift-custom-build.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name: "Swift analysis using a custom build command"
22
description: "Tests creation of a Swift database using custom build"
33
versions: ["latest", "default", "nightly-latest"]
4-
operatingSystems: ["ubuntu", "macos"]
4+
# TODO: Add ubuntu back for `nightly-latest` and `latest` once CLI v2.17.4 is available.
5+
operatingSystems: ["macos"]
56
env:
67
DOTNET_GENERATE_ASPNET_CERTIFICATE: "false"
78
steps:

pr-checks/checks/unset-environment.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: "Test unsetting environment variables"
22
description: "An end-to-end integration test that unsets some environment variables"
3-
operatingSystems: ["ubuntu"]
3+
# TODO: Switch back to all versions once CLI v2.17.4 is available and running on ubuntu again.
4+
versions: ["stable-v2.14.6", "stable-v2.15.5", "stable-v2.16.6", "latest", "default", "nightly-latest"]
5+
operatingSystems: ["macos"] # TODO: Switch back to ubuntu for `nightly-latest` and `latest` once CLI v2.17.4 is available.
46
steps:
57
- uses: ./../action/init
68
id: init
@@ -10,6 +12,9 @@ steps:
1012
- uses: ./../action/.github/actions/setup-swift
1113
with:
1214
codeql-path: ${{ steps.init.outputs.codeql-path }}
15+
- uses: actions/setup-go@v5
16+
with:
17+
go-version: '>=1.21.0'
1318
- name: Build code
1419
shell: bash
1520
# Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a

src/defaults.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"bundleVersion": "codeql-bundle-v2.17.2",
3-
"cliVersion": "2.17.2",
4-
"priorBundleVersion": "codeql-bundle-v2.17.1",
5-
"priorCliVersion": "2.17.1"
2+
"bundleVersion": "codeql-bundle-v2.17.3",
3+
"cliVersion": "2.17.3",
4+
"priorBundleVersion": "codeql-bundle-v2.17.2",
5+
"priorCliVersion": "2.17.2"
66
}

0 commit comments

Comments
 (0)