Skip to content
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.

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

Merge main into releases/v3 #2300

Merged
merged 31 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6182f33
Add documentation for the tools option in the various workflow files
NlightNFotis May 10, 2024
eb4969f
Clarify wording
NlightNFotis May 10, 2024
4f59156
Improve wording on internal workflows and add clarification for tools…
NlightNFotis May 13, 2024
bc3670a
Enable database uploads for GHEC-DR
koesie10 Apr 23, 2024
90e315a
Update tests for GHEC-DR
koesie10 May 13, 2024
9f6ef11
Update changelog and version after v3.25.5
github-actions[bot] May 13, 2024
32f554e
Update checked-in dependencies
github-actions[bot] May 13, 2024
bf2faab
Merge pull request #2288 from github/mergeback/v3.25.5-to-main-b7cec752
henrymercer May 13, 2024
cbe408d
Add option `tools: linked` for init action.
NlightNFotis May 8, 2024
cff15d7
Add logging for CodeQL CLI Version and add tests to the logger for it.
NlightNFotis May 8, 2024
c92bbd4
Add test for CodeQL version appearing in log.
NlightNFotis May 9, 2024
998a4c7
Change overriding log message to make default version more explicit.
NlightNFotis May 9, 2024
4522b08
[SYNC] Sync files in lib/ as requested by CI check that is failing
NlightNFotis May 9, 2024
1796f54
Add new input option `tools: linked` to CHANGELOG
NlightNFotis May 9, 2024
bcc1365
Move logging messages to downstream function and add deprecation notice
NlightNFotis May 10, 2024
df4819e
Soften deprecation message wording and remove unhelpful version strin…
NlightNFotis May 13, 2024
5a14b05
Merge pull request #2281 from github/tools_latest_improvement
NlightNFotis May 13, 2024
08487db
Merge pull request #2284 from github/NlightNFotis/add_tools_help
NlightNFotis May 13, 2024
24766fc
Fix trailing slash on uploads URL
koesie10 May 13, 2024
931fabe
Remove feature flag for combine SARIF files deprecation warning
koesie10 May 14, 2024
7fd4900
Merge pull request #2292 from github/koesie10/remove-combine-sarif-fi…
koesie10 May 14, 2024
9f32769
Update docs for `build-mode: autobuild`
henrymercer May 15, 2024
3b42294
Bump the npm group across 1 directory with 4 updates
dependabot[bot] May 15, 2024
e54dea2
Update checked-in dependencies
github-actions[bot] May 15, 2024
b7ef64e
Merge pull request #2294 from github/dependabot/npm_and_yarn/npm-d328…
henrymercer May 15, 2024
a57c67b
Merge pull request #2286 from github/koesie10/ghec-dr-db-upload
koesie10 May 15, 2024
de1ac31
Update default bundle to codeql-bundle-v2.17.3
github-actions[bot] May 15, 2024
e9e2729
Add changelog note
github-actions[bot] May 15, 2024
0d9161c
Merge pull request #2293 from github/henrymercer/update-build-mode-au…
henrymercer May 15, 2024
63d519c
Merge pull request #2295 from github/update-bundle/codeql-bundle-v2.17.3
dbartol May 17, 2024
00792ab
Update changelog for v3.25.6
github-actions[bot] May 20, 2024
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
11 changes: 10 additions & 1 deletion .github/actions/check-codescanning-config/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,16 @@ inputs:
tools:
required: true
description: |
The url of codeql to use.
The version of CodeQL passed to the `tools` input of the init action.
This can be any of the following:

- A local path to a tarball containing the CodeQL tools, or
- A URL to a GitHub release assets containing the CodeQL tools, or
- A special value `linked` which is forcing the use of the CodeQL tools
that the action has been bundled with.

If not specified, the Action will check in several places until it finds
the CodeQL tools.

runs:
using: composite
Expand Down
11 changes: 10 additions & 1 deletion .github/actions/query-filter-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,16 @@ inputs:
tools:
required: true
description: |
The url of codeql to use.
The version of CodeQL passed to the `tools` input of the init action.
This can be any of the following:

- A local path to a tarball containing the CodeQL tools, or
- A URL to a GitHub release assets containing the CodeQL tools, or
- A special value `linked` which is forcing the use of the CodeQL tools
that the action has been bundled with.

If not specified, the Action will check in several places until it finds
the CodeQL tools.

runs:
using: composite
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th

Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. For example `3.22.11` was the first `v3` release and is functionally identical to `2.22.11`. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers.

## 3.25.6 - 20 May 2024

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

## 3.25.5 - 13 May 2024

- Add a compatibility matrix of supported CodeQL Action, CodeQL CLI, and GitHub Enterprise Server versions to the [README.md](README.md). [#2273](https://github.com/github/codeql-action/pull/2273)
- Avoid printing out a warning for a missing `on.push` trigger when the CodeQL Action is triggered via a `workflow_call` event. [#2274](https://github.com/github/codeql-action/pull/2274)
- The `tools: latest` input to the `init` Action has been renamed to `tools: linked`. This option specifies that the Action should use the tools shipped at the same time as the Action. The old name will continue to work for backwards compatibility, but we recommend that new workflows use the new name. [#2281](https://github.com/github/codeql-action/pull/2281)

## 3.25.4 - 08 May 2024

Expand Down
19 changes: 13 additions & 6 deletions init/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@ description: 'Set up CodeQL'
author: 'GitHub'
inputs:
tools:
description: URL of CodeQL tools
description: >-
By default, the Action will use the recommended version of the CodeQL
Bundle to analyze your project. You can override this choice using this
input. One of:

- A local path to a CodeQL Bundle tarball, or
- The URL of a CodeQL Bundle tarball GitHub release asset, or
- A special value `linked` which uses the version of the CodeQL tools
that the Action has been bundled with.

If not specified, the Action will check in several places until it finds
the CodeQL tools.
required: false
# If not specified the Action will check in several places until it finds the CodeQL tools.
languages:
description: >-
A comma-separated list of CodeQL languages to analyze.
Expand All @@ -26,10 +36,7 @@ inputs:
- `none`: The database will be created without building the source code.
Available for all interpreted languages and some compiled languages.
- `autobuild`: The database will be created by attempting to automatically build the source
code.
To use this build mode, ensure that your workflow calls the `autobuild` action
between the `init` and `analyze` steps.
Available for all compiled languages.
code. Available for all compiled languages.
- `manual`: The database will be created by building the source code using a manually
specified build command. To use this build mode, specify manual build steps in
your workflow between the `init` and `analyze` steps. Available for all
Expand Down
16 changes: 13 additions & 3 deletions lib/database-upload.js

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

2 changes: 1 addition & 1 deletion lib/database-upload.js.map

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

19 changes: 13 additions & 6 deletions lib/database-upload.test.js

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

Loading
Loading