FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge main into v1 by github-actions[bot] · Pull Request #874 · github/codeql-action · GitHub

/ codeql-action Public

Merge main into v1 - #874

Merged
aeisenberg merged 16 commits into
v1from
update-v1.0.28-b31df3ff
Jan 18, 2022
ConversationCommits (16)ChecksFiles changed
Merged

Merge main into v1#874
aeisenberg merged 16 commits into
v1from
update-v1.0.28-b31df3ff

Conversation

github-actions Bot commented Jan 18, 2022 •
edited by aeisenberg
Loading

Copy link
Copy Markdown
Contributor

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
Update changelog and version after v1.0.27
c2a7379
1.0.28
f6f23f8
Update checked-in dependencies
f8a48f4
Merge pull request #871 from github/mergeback/v1.0.27-to-main-cd783c8a
cbabe47 
Mergeback v1.0.27 refs/heads/v1 into main
Bump CodeQL version to 2.7.5
d85c3e5
Change category uniqueness test
8454e21 
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.
Allow duplicate categories in the same validation step
ab1f709 
A single SARIF file should be allowed to have duplicated
categories.
Update warning about interpreted languages to mention Ruby
df0c306
Merge pull request #873 from github/nickrolfe/ruby
b6fbcca 
Update warning about interpreted languages to mention Ruby
Merge branch 'main' into aeisenberg/category-with-tool
8de62be
Merge remote-tracking branch 'origin/main' into hmakholm/pr/2.7.5
9913c9b
Merge pull request #872 from github/aeisenberg/category-with-tool
b886234 
Change category uniqueness test
Merge remote-tracking branch 'origin/main' into hmakholm/pr/2.7.5
776db51
Merge pull request #866 from github/hmakholm/pr/2.7.5
b31df3f 
Bump CodeQL version to 2.7.5
1.0.28
ec1b165
edoardopirovano reviewed Jan 18, 2022
View reviewed changes
Comment thread CHANGELOG.md Outdated

## 1.0.28 - 18 Jan 2022

No user facing changes.

edoardopirovano Jan 18, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

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

aeisenberg Jan 18, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

And I also need to add a note about #872

aeisenberg commented Jan 18, 2022

Copy link
Copy Markdown
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 commented Jan 18, 2022

Copy link
Copy Markdown
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 👍

hmakholm previously requested changes Jan 18, 2022
View reviewed changes
Comment thread CHANGELOG.md Outdated

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

hmakholm Jan 18, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

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.

aeisenberg Jan 18, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Yes.

aeisenberg Jan 18, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

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

Update changelog
19970ae 
Add an entry and move an entry.
aeisenberg force-pushed the update-v1.0.28-b31df3ff branch from 53a2f66 to 19970ae Compare January 18, 2022 20:44
aeisenberg marked this pull request as ready for review January 18, 2022 20:46
aeisenberg requested a review from a team as a code owner January 18, 2022 20:46
aeisenberg requested a review from hmakholm January 18, 2022 20:46
edoardopirovano approved these changes Jan 18, 2022
View reviewed changes

edoardopirovano left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

LGTM now.

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

Concerns have been addressed.

aeisenberg enabled auto-merge January 18, 2022 20:51
aeisenberg merged commit 8a4b243 into v1 Jan 18, 2022
aeisenberg deleted the update-v1.0.28-b31df3ff branch January 18, 2022 21:33
aliscco mentioned this pull request Apr 25, 2023
Open
snyk-bot mentioned this pull request Apr 29, 2023
Open
This file contains hidden or 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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

aeisenberg aeisenberg left review comments
hmakholm Awaiting requested review from hmakholm
+1 more reviewer
edoardopirovano edoardopirovano approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

aeisenberg

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

Back | FazBrowse Home | New Git URL