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

Merged
merged 13 commits into from
Aug 19, 2024
Merged

Merge releases/v3 into releases/v2 #2433

merged 13 commits into from
Aug 19, 2024
+14 −7

Conversation

github-actions[bot]
Copy link
Contributor

Merging 883d858 into releases/v2.

Conductor for this PR is @henrymercer.

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.
  • 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.

github-actions bot and others added 12 commits August 14, 2024 16:09
@github-actions
Update changelog and version after v3.26.2
25a5b8f
@github-actions
Update checked-in dependencies
676519a
@alexet
Merge pull request #2426 from github/mergeback/v3.26.2-to-main-429e1977
5c681ef 
Mergeback v3.26.2 refs/heads/releases/v3 into main
@henrymercer
Fix writing diagnostics on Windows
e5a6587 
Remove colons from the generated filename so it is valid on Windows.
@henrymercer
Add changelog note
e2bb5a2
@henrymercer
Merge pull request #2430 from github/henrymercer/windows-diagnostics-fix
b187c86 
Fix writing diagnostics on Windows
@github-actions
Update changelog for v3.26.3
e100ceb
@henrymercer
Merge pull request #2431 from github/update-v3.26.3-b187c86ce
883d858 
Merge main into releases/v3
@github-actions
Revert "Update version and changelog for v2.26.2"
4d41234 
This reverts commit ee7156a.
@github-actions
Revert "Update checked-in dependencies"
cd78b0c 
This reverts commit b6f3dd5.
@github-actions
Merge remote-tracking branch 'origin/releases/v3' into backport-v2.26…
0c65e51 
….3-883d8588e
@github-actions
Update version and changelog for v2.26.3
9a0f190
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Aug 19, 2024
@henrymercer henrymercer marked this pull request as ready for review August 19, 2024 16:58
@henrymercer henrymercer requested a review from a team as a code owner August 19, 2024 16:58
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Aug 19, 2024
@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.

@github-actions github-actions bot marked this pull request as draft August 19, 2024 16:59
@henrymercer henrymercer marked this pull request as ready for review August 19, 2024 17:00
@henrymercer henrymercer merged commit d65d0c9 into releases/v2 Aug 19, 2024
304 checks passed
@henrymercer henrymercer deleted the backport-v2.26.3-883d8588e branch August 19, 2024 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@henrymercer henrymercer henrymercer approved these changes

Assignees

@henrymercer henrymercer

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@henrymercer @alexet