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 #874

Merged
merged 16 commits into from Jan 18, 2022
Merged

Merge main into v1 #874

merged 16 commits into from Jan 18, 2022

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jan 18, 2022

Merging b31df3f into v1

Conductor for this PR is @aeisenberg

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.

github-actions[bot] and others added 15 commits January 11, 2022 21:43
Turboscan only allows a single combination of tool name and automation
details id for testing category uniqueness.

Previously, the check in the action was not entirely correct since it
only looked at the _category_ and not the combination of the category
and the tool name.

It's even more precise now since it is looking at the actual, computed
value of the automation details id, rather than an inputted value of
the category.

This change also includes a refactoring where the action is now avoiding
multiple parsing/stringifying of the sarif files. Instead, sarif is
parsed once at the start of the process and stringified once, after
sarif processing is completely finished.
A single SARIF file should be allowed to have duplicated
categories.
Update warning about interpreted languages to mention Ruby
CHANGELOG.md Outdated
@@ -1,9 +1,14 @@
# CodeQL Action and CodeQL Runner Changelog

## 1.0.28 - 18 Jan 2022

No user facing changes.
Copy link
Contributor

Choose a reason for hiding this comment

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

This doesn't look right. Shouldn't the version bump to 2.7.5 be here?

Copy link
Contributor

Choose a reason for hiding this comment

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

And I also need to add a note about #872

@aeisenberg
Copy link
Contributor

@hmakholm, is there any problem with doing this release with the new 2.7.5 CLI now? If you're still waiting to make sure all is OK, I can wait a bit.

I'd like to get #872 into v1.

@hmakholm
Copy link
Contributor

@hmakholm, is there any problem with doing this release with the new 2.7.5 CLI now?

It's been 25 hours since the bundle bump was merged, and I haven't noticed any screaming, so 👍

CHANGELOG.md Outdated
## 1.0.27 - 11 Jan 2022

- The `analyze` and `upload-sarif` actions will now wait up to 2 minutes for processing to complete after they have uploaded the results so they can report any processing errors that occurred. This behavior can be disabled by setting the `wait-for-processing` action input to `"false"`.

- Update default CodeQL bundle version to 2.7.5.
Copy link
Contributor

Choose a reason for hiding this comment

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

Oops, this got mismerged into the wrong section of the changelog when I updated my PR.

IIUC the right procedure is to fix it in this PR and then a mergeback PR will be autogenerated.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes.

Copy link
Contributor

Choose a reason for hiding this comment

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

I also need to add a change log entry for another feature. So please don't merge until my change is in as well.

Add an entry and move an entry.
@aeisenberg aeisenberg marked this pull request as ready for review January 18, 2022 20:46
@aeisenberg aeisenberg requested a review from a team as a code owner January 18, 2022 20:46
Copy link
Contributor

@edoardopirovano edoardopirovano left a comment

Choose a reason for hiding this comment

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

LGTM now.

@aeisenberg aeisenberg dismissed hmakholm’s stale review January 18, 2022 20:51

Concerns have been addressed.

@aeisenberg aeisenberg merged commit 8a4b243 into v1 Jan 18, 2022
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.

None yet

4 participants