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 releases/v3 into releases/v2 #2180

Merged
merged 36 commits into from Mar 1, 2024
Merged

Conversation

angelapwen
Copy link
Contributor

@angelapwen angelapwen commented Feb 29, 2024

Merging 8a470fd into releases/v2.

Conductor for this PR is @angelapwen.

Contains the following pull requests:

Please do the following:

  • Ensure package.json file contains the correct version.
  • Add commits to this branch to resolve the merge conflicts in the following files:
    • package-lock.json
    • package.json
  • Ensure another maintainer has reviewed the additional commits you added to this branch to resolve the merge conflicts.
  • 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.
  • Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.
  • Wait for the "Update dependencies" workflow to push a commit updating the dependencies.
  • Mark the PR as ready for review to trigger the full set of PR checks.
  • Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.

henrymercer and others added 30 commits February 22, 2024 21:07
Mergeback v3.24.5 refs/heads/releases/v3 into main
Bumps the npm group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [@octokit/types](https://github.com/octokit/types.ts) | `12.5.0` | `12.6.0` |
| [@types/semver](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/semver) | `7.5.7` | `7.5.8` |
| [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `7.0.2` | `7.1.0` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `7.0.2` | `7.1.0` |
| [eslint](https://github.com/eslint/eslint) | `8.56.0` | `8.57.0` |


Updates `@octokit/types` from 12.5.0 to 12.6.0
- [Release notes](https://github.com/octokit/types.ts/releases)
- [Commits](octokit/types.ts@v12.5.0...v12.6.0)

Updates `@types/semver` from 7.5.7 to 7.5.8
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/semver)

Updates `@typescript-eslint/eslint-plugin` from 7.0.2 to 7.1.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.1.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 7.0.2 to 7.1.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.1.0/packages/parser)

Updates `eslint` from 8.56.0 to 8.57.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.56.0...v8.57.0)

---
updated-dependencies:
- dependency-name: "@octokit/types"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: npm
- dependency-name: "@types/semver"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm
...

Signed-off-by: dependabot[bot] <support@github.com>
…c0b80b

Bump the npm group with 5 updates
Only warn about path filters in the Action if the CLI doesn't already warn
We can't use the "Rebuild" label on a PR with conflicts because the
`pull_request` event runs on a synthetic merge commit.
…elds

Add build mode, Actions event name, and languages to the status report
This describes what we are trying to do more accurately.
Classify third-party upload `SyntaxError`s as configuration errors
Nitty: make it a little clearer when this shows up in the logs what type of request we mean
…its-errors-as-configuration-errors

Mark limits errors from third-party SARIF uploads as configuration errors
…uccess

Add `languages` and `build_mode` to `init` `success` status report
@angelapwen angelapwen added the Update dependencies Trigger PR workflow to update dependencies label Feb 29, 2024
@angelapwen angelapwen self-assigned this Feb 29, 2024
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Feb 29, 2024
@angelapwen angelapwen added the Update dependencies Trigger PR workflow to update dependencies label Feb 29, 2024
Copy link
Contributor

Pushed a commit to update the checked-in dependencies. Please mark the PR as ready for review to trigger PR checks.

@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Feb 29, 2024
@angelapwen angelapwen marked this pull request as ready for review February 29, 2024 17:34
@angelapwen angelapwen requested a review from a team as a code owner February 29, 2024 17:34
@henrymercer
Copy link
Contributor

@angelapwen I just made one change, which was to remove the input() in the merge commit rather than the "Update version and changelog for v2.24.6" commit. This just means that when we revert the "Update version and changelog for v2.24.6" commit as part of the v2.24.7 backport, we won't introduce the input() again. Otherwise LGTM!

@angelapwen
Copy link
Contributor Author

@angelapwen I just made one change, which was to remove the input() in the merge commit rather than the "Update version and changelog for v2.24.6" commit. This just means that when we revert the "Update version and changelog for v2.24.6" commit as part of the v2.24.7 backport, we won't introduce the input() again. Otherwise LGTM!

Makes sense, thank you!

@angelapwen
Copy link
Contributor Author

Oops... I can't approve because I authored the PR 😆 could you @henrymercer?

@angelapwen angelapwen merged commit 928ff8c into releases/v2 Mar 1, 2024
297 checks passed
@angelapwen angelapwen deleted the backport-v2.24.6-8a470fdda branch March 1, 2024 10:19
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

3 participants