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

Merged
merged 26 commits into from
May 25, 2023
Merged

Merge main into releases/v2 #1706

merged 26 commits into from
May 25, 2023

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented May 25, 2023

Merging d3314cc into releases/v2.

Conductor for this PR is @aeisenberg.

Contains the following pull requests:

Please do the following:

  • Ensure the CHANGELOG displays the correct version and date.
  • Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.
  • Check that there are not any unexpected commits being merged into the releases/v2 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.
  • Merge the mergeback PR that will automatically be created once this PR is merged.

kaeluka and others added 25 commits May 24, 2023 11:46
DISABLE_DUPLICATE_LOCATION_FIX - this is to avoid needless crashes on
large sarif files
Mergeback v2.3.4 refs/heads/releases/v2 into main
Avoid parsing SARIF file when workaround for duplicate notification locations is disabled
Fix running tests on forks, and handle invalid URIs when fingerprinting
The recent update of jsonschema inadvertently caused extra validation of
`uri-reference` formatted properties. This change ensures that these
errors are converted to warnings.

Note that we cannot revert the change to jsonschema since the old
version does not handle `uniqueItems` correctly.
@aeisenberg aeisenberg marked this pull request as ready for review May 25, 2023 18:23
@aeisenberg aeisenberg requested a review from a team as a code owner May 25, 2023 18:23
@aeisenberg
Copy link
Contributor

@henrymercer do you think we need a changelog entry for #1694?

@henrymercer
Copy link
Contributor

We could add something like "Gracefully handle invalid URIs when fingerprinting"?

@aeisenberg
Copy link
Contributor

I'll add that.

@aeisenberg aeisenberg enabled auto-merge May 25, 2023 18:51
@aeisenberg aeisenberg merged commit 0225834 into releases/v2 May 25, 2023
@aeisenberg aeisenberg deleted the update-v2.3.5-d3314cca2 branch May 25, 2023 19:10
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