Skip to content

Commit b20883b

Browse files
authored
Merge pull request #3428 from github/update-v4.32.0-e3b8227a2
Merge main into releases/v4
2 parents 19b2f06 + c9aa45d commit b20883b

21 files changed

+99
-51
lines changed

.github/workflows/__build-mode-autobuild.yml

Lines changed: 8 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/update-bundle.yml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,24 @@ jobs:
5757
- name: Update bundle
5858
uses: ./.github/actions/update-bundle
5959

60+
- name: Bump Action minor version if new CodeQL minor version series
61+
id: bump-action-version
62+
run: |
63+
prior_cli_version=$(jq -r '.priorCliVersion' src/defaults.json)
64+
cli_version=$(jq -r '.cliVersion' src/defaults.json)
65+
66+
prior_minor=$(echo "$prior_cli_version" | cut -d. -f2)
67+
current_minor=$(echo "$cli_version" | cut -d. -f2)
68+
69+
if [[ "$current_minor" != "$prior_minor" ]]; then
70+
echo "New CodeQL minor version series ($prior_cli_version -> $cli_version), bumping Action minor version"
71+
npm version minor --no-git-tag-version
72+
echo "bumped=true" >> "$GITHUB_OUTPUT"
73+
else
74+
echo "Same minor version series ($prior_cli_version -> $cli_version), skipping Action version bump"
75+
echo "bumped=false" >> "$GITHUB_OUTPUT"
76+
fi
77+
6078
- name: Rebuild Action
6179
run: npm run build
6280

@@ -71,11 +89,19 @@ jobs:
7189
- name: Open pull request
7290
env:
7391
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
92+
ACTION_VERSION_BUMPED: ${{ steps.bump-action-version.outputs.bumped }}
7493
run: |
7594
cli_version=$(jq -r '.cliVersion' src/defaults.json)
95+
action_version=$(jq -r '.version' package.json)
96+
97+
pr_body="This pull request updates the default CodeQL bundle, as used with \`tools: linked\` and on GHES, to $cli_version."
98+
if [[ "$ACTION_VERSION_BUMPED" == "true" ]]; then
99+
pr_body+=$'\n\n'"Since this is a new CodeQL minor version series, this PR also bumps the Action version to $action_version."
100+
fi
101+
76102
pr_url=$(gh pr create \
77103
--title "Update default bundle to $cli_version" \
78-
--body "This pull request updates the default CodeQL bundle, as used with \`tools: linked\` and on GHES, to $cli_version." \
104+
--body "$pr_body" \
79105
--assignee "$GITHUB_ACTOR" \
80106
--draft \
81107
)

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs.
44

5+
## 4.32.0 - 26 Jan 2026
6+
7+
- Update default CodeQL bundle version to [2.24.0](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.24.0). [#3425](https://github.com/github/codeql-action/pull/3425)
8+
59
## 4.31.11 - 23 Jan 2026
610

711
- When running a Default Setup workflow with [Actions debugging enabled](https://docs.github.com/en/actions/how-tos/monitor-workflows/enable-debug-logging), the CodeQL Action will now use more unique names when uploading logs from the Dependabot authentication proxy as workflow artifacts. This ensures that the artifact names do not clash between multiple jobs in a build matrix. [#3409](https://github.com/github/codeql-action/pull/3409)

lib/analyze-action-post.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/analyze-action.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/autobuild-action.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/defaults.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"bundleVersion": "codeql-bundle-v2.23.9",
3-
"cliVersion": "2.23.9",
4-
"priorBundleVersion": "codeql-bundle-v2.23.8",
5-
"priorCliVersion": "2.23.8"
2+
"bundleVersion": "codeql-bundle-v2.24.0",
3+
"cliVersion": "2.24.0",
4+
"priorBundleVersion": "codeql-bundle-v2.23.9",
5+
"priorCliVersion": "2.23.9"
66
}

lib/init-action-post.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/init-action.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/resolve-environment-action.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)