Skip to content

Commit 04daf01

Browse files
authored
Merge pull request #1885 from github/update-v2.21.7-e982de4fb
Merge main into releases/v2
2 parents 701f152 + bb3bc25 commit 04daf01

File tree

7 files changed

+18
-14
lines changed

7 files changed

+18
-14
lines changed

Diff for: .github/workflows/update-dependencies.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ jobs:
3636
git push origin "HEAD:$BRANCH"
3737
echo "Pushed a commit to update the checked-in dependencies." \
3838
"Please mark the PR as ready for review to trigger PR checks." |
39-
gh pr comment --body-file - --repo github/codeql-action --pr "${{ github.event.pull_request.number }}"
40-
gh pr ready --undo --repo github/codeql-action --pr "${{ github.event.pull_request.number }}"
39+
gh pr comment --body-file - --repo github/codeql-action "${{ github.event.pull_request.number }}"
40+
gh pr ready --undo --repo github/codeql-action "${{ github.event.pull_request.number }}"
4141
fi

Diff for: CHANGELOG.md

+4
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+
## 2.21.7 - 14 Sep 2023
6+
7+
- Update default CodeQL bundle version to 2.14.5. [#1882](https://github.com/github/codeql-action/pull/1882)
8+
59
## 2.21.6 - 13 Sep 2023
610

711
- Better error message when there is a failure to determine the merge base of the code to analysis. [#1860](https://github.com/github/codeql-action/pull/1860)

Diff for: lib/defaults.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"bundleVersion": "codeql-bundle-v2.14.4",
3-
"cliVersion": "2.14.4",
4-
"priorBundleVersion": "codeql-bundle-v2.14.3",
5-
"priorCliVersion": "2.14.3"
2+
"bundleVersion": "codeql-bundle-v2.14.5",
3+
"cliVersion": "2.14.5",
4+
"priorBundleVersion": "codeql-bundle-v2.14.4",
5+
"priorCliVersion": "2.14.4"
66
}

Diff for: 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.

Diff for: package-lock.json

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

Diff for: package.json

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

Diff for: src/defaults.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"bundleVersion": "codeql-bundle-v2.14.4",
3-
"cliVersion": "2.14.4",
4-
"priorBundleVersion": "codeql-bundle-v2.14.3",
5-
"priorCliVersion": "2.14.3"
2+
"bundleVersion": "codeql-bundle-v2.14.5",
3+
"cliVersion": "2.14.5",
4+
"priorBundleVersion": "codeql-bundle-v2.14.4",
5+
"priorCliVersion": "2.14.4"
66
}

0 commit comments

Comments
 (0)