Skip to content

Commit

Permalink
Merge branch 'main' into marcogario/require_workflows_path
Browse files Browse the repository at this point in the history
  • Loading branch information
Marco Gario authored and GitHub committed Jul 1, 2024
2 parents 0ff1bdb + 79e9a50 commit dbfc2b6
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 12 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the

## [UNRELEASED]

No user facing changes.

## 3.25.11 - 28 Jun 2024

- Avoid failing the workflow run if there is an error while uploading debug artifacts. [#2349](https://github.com/github/codeql-action/pull/2349)
- Update default CodeQL bundle version to 2.17.6. [#2352](https://github.com/github/codeql-action/pull/2352)

## 3.25.10 - 13 Jun 2024

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.17.5",
"cliVersion": "2.17.5",
"priorBundleVersion": "codeql-bundle-v2.17.4",
"priorCliVersion": "2.17.4"
"bundleVersion": "codeql-bundle-v2.17.6",
"cliVersion": "2.17.6",
"priorBundleVersion": "codeql-bundle-v2.17.5",
"priorCliVersion": "2.17.5"
}
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": "3.25.11",
"version": "3.25.12",
"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.17.5",
"cliVersion": "2.17.5",
"priorBundleVersion": "codeql-bundle-v2.17.4",
"priorCliVersion": "2.17.4"
"bundleVersion": "codeql-bundle-v2.17.6",
"cliVersion": "2.17.6",
"priorBundleVersion": "codeql-bundle-v2.17.5",
"priorCliVersion": "2.17.5"
}

0 comments on commit dbfc2b6

Please sign in to comment.