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

Merged
merged 25 commits into from
Nov 14, 2023
Merged

Merge main into releases/v2 #1990

merged 25 commits into from
Nov 14, 2023

Conversation

github-actions[bot]
Copy link
Contributor

Merging 8c8c7b4 into releases/v2.

Conductor for this PR is @smowton.

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.

github-actions bot and others added 25 commits October 27, 2023 09:31
Mergeback v2.22.5 refs/heads/releases/v2 into main
Tell VSCode to format code with Prettier, since that's the same tool we
use to check the format with `npm run lint`.
VSCode settings: set default formatter for TS
* Bump the npm group with 5 updates

Bumps the npm group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [@octokit/types](https://github.com/octokit/types.ts) | `12.0.0` | `12.1.1` |
| [@types/sinon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/sinon) | `10.0.19` | `10.0.20` |
| [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `6.9.0` | `6.9.1` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `6.9.0` | `6.9.1` |
| [nock](https://github.com/nock/nock) | `13.3.6` | `13.3.7` |


Updates `@octokit/types` from 12.0.0 to 12.1.1
- [Release notes](https://github.com/octokit/types.ts/releases)
- [Commits](octokit/types.ts@v12.0.0...v12.1.1)

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

Updates `@typescript-eslint/eslint-plugin` from 6.9.0 to 6.9.1
- [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/v6.9.1/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 6.9.0 to 6.9.1
- [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/v6.9.1/packages/parser)

Updates `nock` from 13.3.6 to 13.3.7
- [Release notes](https://github.com/nock/nock/releases)
- [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md)
- [Commits](nock/nock@v13.3.6...v13.3.7)

---
updated-dependencies:
- dependency-name: "@octokit/types"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: npm
- dependency-name: "@types/sinon"
  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-patch
  dependency-group: npm
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm
- dependency-name: nock
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update checked-in dependencies

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
3.12 does not work.
Only run use 3.11 on versions of of the CLI that we know don't support
3.12.
Use the correct action input parameter
Co-authored-by: Henry Mercer <[email protected]>
Ensure that pythion 3.11 is used for older CLIs on windows.
Add changenote for Python 3.12 incompatibility on MacOS
@smowton smowton marked this pull request as ready for review November 14, 2023 12:17
@smowton smowton requested a review from a team as a code owner November 14, 2023 12:17
@smowton smowton enabled auto-merge November 14, 2023 12:17
@smowton smowton merged commit 689fdc5 into releases/v2 Nov 14, 2023
357 checks passed
@smowton smowton deleted the update-v2.22.6-8c8c7b4d8 branch November 14, 2023 12:50
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.

4 participants