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/v2 #1192

Merged
merged 126 commits into from
Aug 19, 2022
Merged

Merge main into releases/v2 #1192

merged 126 commits into from
Aug 19, 2022

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 17, 2022

Merging 5502fef into releases/v2

Conductor for this PR is @henrymercer

Contains the following pull requests:

Please review the following:

  • The CHANGELOG displays the correct version and date.
  • The CHANGELOG includes all relevant, user-facing changes since the last release.
  • There are no unexpected commits being merged into the releases/v2 branch.
  • The docs team is aware of any documentation changes that need to be released.
  • The mergeback PR is merged back into main after this PR is merged.
  • The v1 release PR is merged after this PR is merged.

aeisenberg and others added 30 commits June 27, 2022 13:13
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>
henrymercer and others added 17 commits August 16, 2022 16:19
…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 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
@henrymercer
Copy link
Contributor

henrymercer commented Aug 17, 2022

@aeisenberg Just going through the checklist here:

The docs team is aware of any documentation changes that need to be released.

Could I get your 👍 that the docs team are aware of the query filtering documentation changes?

@henrymercer henrymercer marked this pull request as ready for review August 17, 2022 16:39
@henrymercer henrymercer requested a review from a team as a code owner August 17, 2022 16:39
@aeisenberg
Copy link
Contributor

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.

@henrymercer henrymercer enabled auto-merge August 17, 2022 16:55
@henrymercer henrymercer disabled auto-merge August 17, 2022 17:32
@henrymercer henrymercer merged commit f5d217b into releases/v2 Aug 19, 2022
@henrymercer henrymercer deleted the update-v2.1.19-5502fefd branch August 19, 2022 09:40
@github-actions github-actions bot mentioned this pull request Aug 19, 2022
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants