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.

Sign up for GitHub

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

Jump to bottom

Merge releases/v3 into releases/v2 #2054

Merged
merged 36 commits into from
Dec 22, 2023
Merged

Merge releases/v3 into releases/v2 #2054

merged 36 commits into from
Dec 22, 2023

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Dec 22, 2023 •
edited by angelapwen
Loading

Merging 012739e into releases/v2.

Conductor for this PR is @adityasharad.

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:
    • CONTRIBUTING.md
  • 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.

dependabot bot and others added 30 commits December 13, 2023 11:05
@dependabot
Bump the npm group with 4 updates
dcf89a7 
Bumps the npm group with 4 updates: [@octokit/types](https://github.com/octokit/types.ts), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin), [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) and [typescript](https://github.com/Microsoft/TypeScript).


Updates `@octokit/types` from 12.3.0 to 12.4.0
- [Release notes](https://github.com/octokit/types.ts/releases)
- [Commits](octokit/types.ts@v12.3.0...v12.4.0)

Updates `@typescript-eslint/eslint-plugin` from 6.13.2 to 6.14.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/v6.14.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 6.13.2 to 6.14.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/v6.14.0/packages/parser)

Updates `typescript` from 5.3.2 to 5.3.3
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](microsoft/TypeScript@v5.3.2...v5.3.3)

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

Signed-off-by: dependabot[bot] <[email protected]>
@github-actions
Update checked-in dependencies
0d8f348
@henrymercer
Merge branch 'main' into dependabot/npm_and_yarn/npm-0a98872b3d
95591ba
@github-actions
Update changelog and version after v3.22.11
2b2fb6b
@github-actions
Update checked-in dependencies
7813bda
@nickfyson
Merge pull request #2035 from github/mergeback/v3.22.11-to-main-b374143c
ebf5a83 
Mergeback v3.22.11 refs/heads/releases/v3 into main
@henrymercer
Merge pull request #2033 from github/dependabot/npm_and_yarn/npm-0a98…
511f073 
…872b3d

Bump the npm group with 4 updates
@nickfyson
improve handling of changelog processing for backports
8e4a6c7
@nickfyson
change version numbers inside processing function as well
e0c2b0a
@nickfyson @henrymercer
Apply suggestions from code review
ee53012 
Co-authored-by: Henry Mercer <[email protected]>
@nickfyson
rename regex for clarity
fda1796
@nickfyson
preserve trailing whitespace when transforming CHANGELOG
0724061
@nickfyson
raise explicit exception if EOF found when looking for changelog sect…
8e086df 
…ions
@nickfyson
add note on versioning approach to changelog
cda785e
@dependabot @github-actions
Bump the npm group with 2 updates (#2045)
144b7d5 
* Bump the npm group with 2 updates

Bumps the npm group with 2 updates: [eslint](https://github.com/eslint/eslint) and [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import).


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

Updates `eslint-plugin-import` from 2.29.0 to 2.29.1
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](import-js/eslint-plugin-import@v2.29.0...v2.29.1)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm
- dependency-name: eslint-plugin-import
  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>
@nickfyson
Merge pull request #2041 from github/nickfyson/fix-changelog-backports
0978396 
improve handling of changelog processing for backports
@nickfyson
clarify comment on versions in the changelog
8478e2a
@nickfyson
clarify comment on versions in the changelog
2603673
@nickfyson
Merge pull request #2044 from github/nickfyson/update-changelog
7e187e1
@github-actions
Update default bundle to codeql-bundle-v2.15.5
fe1e55f
@github-actions
Add changelog note
a99bd84
@adityasharad
Merge pull request #2047 from github/update-bundle/codeql-bundle-v2.15.5
a110746 
Update default bundle to 2.15.5
@nickfyson
update required checks script to handle release branches
a42c9a2
@nickfyson
add note about backporting check changes to v2 branch
9ed5fc7
@nickfyson
Merge pull request #2050 from github/nickfyson/add-releases-ini
49812ec
@angelapwen
Fix type error
658e3c6
@angelapwen
Typecast OLDEST_SUPPORTED_MAJOR_VERSION when defined
0be9290
@adityasharad
Merge pull request #2051 from github/angelapwen/patch-release-script
40cb08c 
Fix type error in `Update release branch` workflow
@github-actions
Update changelog for v3.22.12
c1cf794
@adityasharad
Merge pull request #2052 from github/update-v3.22.12-40cb08c12
012739e 
Merge main into releases/v3
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Dec 22, 2023
@adityasharad adityasharad added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels Dec 22, 2023
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Dec 22, 2023
@github-actions GitHub Actions
Copy link
Contributor Author

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

@adityasharad adityasharad marked this pull request as ready for review December 22, 2023 04:01
@adityasharad adityasharad requested a review from a team as a code owner December 22, 2023 04:01
angelapwen
angelapwen reviewed Dec 22, 2023
View reviewed changes
CONTRIBUTING.md Outdated
Comment on lines 117 to 121
<<<<<<< HEAD
1. Make a PR to bump the `OLDEST_SUPPORTED_MAJOR_VERSION` in [release-branches.py](.github/actions/release-branches/release-branches.py). Once this PR is merged, the release process will no longer backport changes to the deprecated release version.
=======
1. Make a PR to bump the `OLDEST_SUPPORTED_MAJOR_VERSION` in [releases.ini](.github/releases.ini). Once this PR is merged, the release process will no longer backport changes to the deprecated release version.
>>>>>>> origin/releases/v3
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like this merge conflict still needs to be addressed!

Copy link
Contributor

Choose a reason for hiding this comment

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

Urgh. Pushed to my fork instead of upstream. Fixed now.

angelapwen
angelapwen approved these changes Dec 22, 2023
View reviewed changes
CONTRIBUTING.md
@@ -114,7 +114,7 @@ To deprecate an older version of the Action:
- Implement an Actions warning for customers using the deprecated version.
1. Wait for the deprecation period to pass.
1. Upgrade the Actions warning for customers using the deprecated version to a non-fatal error, and mention that this version of the Action is no longer supported.
1. Make a PR to bump the `OLDEST_SUPPORTED_MAJOR_VERSION` in [release-branches.py](.github/actions/release-branches/release-branches.py). Once this PR is merged, the release process will no longer backport changes to the deprecated release version.
1. Make a PR to bump the `OLDEST_SUPPORTED_MAJOR_VERSION` in [releases.ini](.github/releases.ini). Once this PR is merged, the release process will no longer backport changes to the deprecated release version.
Copy link
Contributor

Choose a reason for hiding this comment

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

TIL about .ini file types 🤯

@angelapwen angelapwen merged commit 1500a13 into releases/v2 Dec 22, 2023
359 checks passed
@angelapwen angelapwen deleted the backport-v2.22.12-012739e50 branch December 22, 2023 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adityasharad adityasharad adityasharad left review comments

@angelapwen angelapwen angelapwen approved these changes

Assignees

@adityasharad adityasharad

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@adityasharad @angelapwen @henrymercer @nickfyson