Merge main into releases/v2 #1192
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
This reverts commit 99d4397.
This reverts commit 43d0664.
This commit adds the packs and queries from the actions input to the config file used by the CodeQL CLI. When the `+` is used, the actions input value is combined with the config value and when it is not used, the input value overrides the config value. This commit also adds a bunch of integration tests for this feature. In order to avoid adding too many new jobs, all of the tests are run sequentially in a single job (matrixed across relevant operating systems and OSes).
When the codescanning config is being used by the CLI, there is a single query suite that is generated that contains all queries to be run by the analysis. This is different from the traditional way, where there are potentially three query suites: builtin, custom, and packs. We need to ensure that when the codescanning config is being used, only a single call to run queries is used, and this call uses the single generated query suite. Also, this commit changes the cutoff version for codescanning config to 2.10.1. Earlier versions work, but there were some bugs that are only fixed in 2.10.1 and later.
Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>
Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>
…er-versions Update supported GitHub Enterprise Server versions.
…ture-flag Enable bypassing the cached CodeQL bundle via a feature flag
Round fields in TRAP caching telemetry to integers
This should help us debug failures on `main` like this https://github.com/github/codeql-action/actions/runs/2875586196.
This should be more robust than determining whether the repo is the CodeQL Action or a fork of it.
…ests-on-push Modify `expect-error` input checking to fix errors on main
Fix TRAP cache upload timing
henrymercer
approved these changes
Aug 17, 2022
|
@aeisenberg Just going through the checklist here:
Could I get your 👍 that the docs team are aware of the query filtering documentation changes? |
|
Yes, documentation is being discussed here: https://github.com/github/docs-content/issues/7617 It is not ready and won't be for another week or two. Maybe we should update that changelog entry when we have documentation. |
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging 5502fef into releases/v2
Conductor for this PR is @henrymercer
Contains the following pull requests:
@actions/cache#1164 - Add dependency on@actions/cache(@edoardopirovano)GITHUB_ACTION_REFfor local actions #1174 - Remove distrust ofGITHUB_ACTION_REFfor local actions (@edoardopirovano)expect-errorinput to force PR check green on expected failure #1177 - Addexpect-errorinput to force PR check green on expected failure (@angelapwen)util.promisifyinstead of manually constructing promise #1184 - Useutil.promisifyinstead of manually constructing promise (@edoardopirovano)expect-errorinput checking to fix errors on main #1190 - Modifyexpect-errorinput checking to fix errors on main (@henrymercer)Please review the following: