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 v1 #601

Merged
merged 26 commits into from
Jun 28, 2021
Merged

Merge main into v1 #601

merged 26 commits into from
Jun 28, 2021

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jun 28, 2021

Merging 7726ece into v1

Conductor for this PR is @edoardopirovano

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 v1 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.

chrisgavin and others added 24 commits June 23, 2021 14:28
Upgrade the tool cache library and use it to download the CodeQL bundle.
This input allows users to specify which packs to run. It works in
unison with the packs block of the config file and it is similar to
how `queries` works. They both use `+` in the same way.

Note that the `#TODO` in the pr check is still around, but the CLI
is available. I will remove the TODO in the next commit.
Fix C# line counting and add test
…ssing

Restore original getCodeQLActionRepository behaviour
Also, update the options and inputs documentation.
Add new `packs` input to init action
@github-actions github-actions bot requested a review from a team as a code owner June 28, 2021 09:02
@edoardopirovano
Copy link
Contributor

Pushed an additional commit to the CHANGELOG mentioning the LOC counting for C# is fixed, and adding a link to the PR for the RUNNER_TEMP issue.

Copy link
Contributor

@aeisenberg aeisenberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Feel free to merge when you're ready.

github-actions[bot] and others added 2 commits June 28, 2021 16:05
@edoardopirovano
Copy link
Contributor

LGTM! Feel free to merge when you're ready.

Rebasing (OOI, why is this necessary? There's not been commits to v1 since this PR was generated?) then will merge after tests pass again.

@edoardopirovano edoardopirovano merged commit 03450ff into v1 Jun 28, 2021
@edoardopirovano edoardopirovano deleted the update-v1.0.4-7726ece0 branch June 28, 2021 15:23
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.

5 participants