Skip to content

Merge main into releases/v2 #1885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cklin merged 9 commits into from
Sep 14, 2023
Merged

Merge main into releases/v2 #1885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
70c4c0f
Update changelog and version after v2.21.6
github-actions[bot] Sep 13, 2023
f664957
Update checked-in dependencies
github-actions[bot] Sep 13, 2023
77a54b6
Remove --pr in update-dependencies.yml
cklin Sep 13, 2023
8efd40b
Merge pull request #1876 from github/mergeback/v2.21.6-to-main-701f152f
cklin Sep 13, 2023
c6c77c8
Merge pull request #1877 from cklin/update-dependencies
cklin Sep 13, 2023
71c7e82
Update default bundle to codeql-bundle-v2.14.5
github-actions[bot] Sep 14, 2023
19c02a4
Add changelog note
github-actions[bot] Sep 14, 2023
e982de4
Merge pull request #1882 from github/update-bundle/codeql-bundle-v2.14.5
cklin Sep 14, 2023
bb3bc25
Update changelog for v2.21.7
github-actions[bot] Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/update-dependencies.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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"
}