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

Merged
merged 48 commits into from
May 24, 2023
Merged

Merge main into releases/v2 #1700

merged 48 commits into from
May 24, 2023

Conversation

github-actions[bot]
Copy link
Contributor

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

Merging 570734c into releases/v2.

Conductor for this PR is @angelapwen.

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.

aeisenberg and others added 30 commits May 2, 2023 13:46
The version we were using is quite old. Copied the latest from
https://github.com/oasis-tcs/sarif-spec/blob/123e95847b13fbdd4cbe2120fa5e33355d4a042b/Schemata/sarif-schema-2.1.0.json

I do not think the sarif spec will be changing any more without
an explicit version update, so this is fine for now.
Fixes bug in `uniqueItems` property.
Mergeback v2.3.3 refs/heads/releases/v2 into main
Co-authored-by: Aditya Sharad <6874315+adityasharad@users.noreply.github.com>
`($i)` is not valid for javascript regexes.
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@5b4a9f6...284f54f)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…evans/create-pull-request-5.0.1

Bump peter-evans/create-pull-request from 5.0.0 to 5.0.1
Co-authored-by: Henry Mercer <henry.mercer@me.com>
Co-authored-by: Henry Mercer <henry.mercer@me.com>
Remove MismatchedBranches check from code scanning workflow validation
The last dot in `=3.11.` is just slightly confusing, so added single
quotes around the environment variable assignments to make it 100% clear
Co-authored-by: Henry Mercer <henry.mercer@me.com>
RasmusWL and others added 17 commits May 15, 2023 12:38
Co-authored-by: Henry Mercer <henry.mercer@me.com>
…cy-installation

Feature flag to disable python dependency installation
Use `resolve extractor` when finding autobuild scripts
Extract semantic CLI version from URL when requesting specific tools
Push back the first bundle released using a semantic version number to 2.13.4 now that we're skipping 2.13.2.
We should check language autodetect for Ruby unconditionally. We can now move it into the step that checks all other languages.
@angelapwen angelapwen marked this pull request as ready for review May 24, 2023 21:42
@angelapwen angelapwen requested a review from a team as a code owner May 24, 2023 21:42
adityasharad
adityasharad previously approved these changes May 24, 2023
CHANGELOG.md Outdated Show resolved Hide resolved
@angelapwen angelapwen enabled auto-merge May 24, 2023 21:52
@angelapwen
Copy link
Contributor

angelapwen commented May 24, 2023

I added a missing PR link to one of the CHANGELOG items, and moved the "Updated the SARIF 2.1.0 JSON schema file to the latest from oasis-tcs/sarif-spec" item to this release's changenote rather than the last. Things were a bit confused due to a merge conflict resolution.

@angelapwen angelapwen merged commit f0e3dfb into releases/v2 May 24, 2023
@angelapwen angelapwen deleted the update-v2.3.4-570734c55 branch May 24, 2023 22:14
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