Skip to content

Commit

Permalink
Merge pull request #1885 from github/update-v2.21.7-e982de4fb
Browse files Browse the repository at this point in the history
Merge main into releases/v2
  • Loading branch information
cklin committed Sep 14, 2023
2 parents 701f152 + bb3bc25 commit 04daf01
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ jobs:
git push origin "HEAD:$BRANCH"
echo "Pushed a commit to update the checked-in dependencies." \
"Please mark the PR as ready for review to trigger PR checks." |
gh pr comment --body-file - --repo github/codeql-action --pr "${{ github.event.pull_request.number }}"
gh pr ready --undo --repo github/codeql-action --pr "${{ github.event.pull_request.number }}"
gh pr comment --body-file - --repo github/codeql-action "${{ github.event.pull_request.number }}"
gh pr ready --undo --repo github/codeql-action "${{ github.event.pull_request.number }}"
fi
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

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

## 2.21.7 - 14 Sep 2023

- Update default CodeQL bundle version to 2.14.5. [#1882](https://github.com/github/codeql-action/pull/1882)

## 2.21.6 - 13 Sep 2023

- 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)
Expand Down
8 changes: 4 additions & 4 deletions lib/defaults.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bundleVersion": "codeql-bundle-v2.14.4",
"cliVersion": "2.14.4",
"priorBundleVersion": "codeql-bundle-v2.14.3",
"priorCliVersion": "2.14.3"
"bundleVersion": "codeql-bundle-v2.14.5",
"cliVersion": "2.14.5",
"priorBundleVersion": "codeql-bundle-v2.14.4",
"priorCliVersion": "2.14.4"
}
2 changes: 1 addition & 1 deletion node_modules/.package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codeql",
"version": "2.21.6",
"version": "2.21.7",
"private": true,
"description": "CodeQL action",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions src/defaults.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bundleVersion": "codeql-bundle-v2.14.4",
"cliVersion": "2.14.4",
"priorBundleVersion": "codeql-bundle-v2.14.3",
"priorCliVersion": "2.14.3"
"bundleVersion": "codeql-bundle-v2.14.5",
"cliVersion": "2.14.5",
"priorBundleVersion": "codeql-bundle-v2.14.4",
"priorCliVersion": "2.14.4"
}

0 comments on commit 04daf01

Please sign in to comment.