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

Merged
merged 18 commits into from
Apr 14, 2022
Merged

Conversation

github-actions[bot]
Copy link

Merging 8aff92c into releases/v2

Conductor for this PR is @henrymercer

Contains the following pull requests:

Contains the following commits not from a pull request:

Please review the following:

  • The CHANGELOG displays the correct version and date.
  • The CHANGELOG includes all relevant, user-facing changes since the last release.
  • There are no unexpected commits being merged into the releases/v2 branch.
  • The docs team is aware of any documentation changes that need to be released.
  • The mergeback PR is merged back into main after this PR is merged.
  • The v1 release PR is merged after this PR is merged.

github-actions[bot] and others added 18 commits April 8, 2022 08:46
autobuild: add working-directory input
Co-authored-by: Henry Mercer <[email protected]>
The process of creating the v1 release can run into merge conflicts. We
commit the unresolved conflicts so a maintainer can easily resolve them
(vs erroring and requiring maintainers to reconstruct the release
manually).
…icts-in-releases

Commit any conflicts during v1 backport to simplify release process
Prepare for renaming `v1` -> `releases/v1` and `v2` -> `releases/v2`.
@henrymercer henrymercer marked this pull request as ready for review April 14, 2022 15:25
@henrymercer henrymercer merged commit 6d3d43b into releases/v2 Apr 14, 2022
@github-actions github-actions bot mentioned this pull request Apr 14, 2022
6 tasks
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