Skip to content

Merge releases/v3 into releases/v2#2446

Merged
angelapwen merged 11 commits intoreleases/v2from
backport-v2.26.5-2c779ab0d
Aug 23, 2024
Merged

Merge releases/v3 into releases/v2#2446
angelapwen merged 11 commits intoreleases/v2from
backport-v2.26.5-2c779ab0d

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Aug 23, 2024 •
edited by angelapwen
Loading

Merging 2c779ab into releases/v2.

Conductor for this PR is @angelapwen.

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 10 commits August 21, 2024 19:23
@github-actions
Update changelog and version after v3.26.4
b15a247
@github-actions
Update checked-in dependencies
6f10eb0
@angelapwen
Merge pull request #2438 from github/mergeback/v3.26.4-to-main-f0f3afee
fd5fa13 
Mergeback v3.26.4 refs/heads/releases/v3 into main
@angelapwen @henrymercer @github-actions
Only run check SIP enablement once in init step (#2441)
7e27807 
Co-authored-by: Henry Mercer <henrymercer@github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions
Update changelog for v3.26.5
68cd1f9
@angelapwen @github-actions @henrymercer
Merge main into releases/v3 (#2444)
2c779ab 
* Update changelog and version after v3.26.4

* Update checked-in dependencies

* Only run check SIP enablement once in `init` step (#2441)

Co-authored-by: Henry Mercer <henrymercer@github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update changelog for v3.26.5

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Angela P Wen <angelapwen@github.com>
Co-authored-by: Henry Mercer <henrymercer@github.com>
@github-actions
Revert "Update version and changelog for v2.26.4"
025a994 
This reverts commit 1de3044.
@github-actions
Revert "Update checked-in dependencies"
4ad2714 
This reverts commit 4799b0f.
@github-actions
Merge remote-tracking branch 'origin/releases/v3' into backport-v2.26…
751600b 
….5-2c779ab0d
@github-actions
Update version and changelog for v2.26.5
df56d39
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Aug 23, 2024
@angelapwen angelapwen added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels Aug 23, 2024
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Aug 23, 2024
@github-actions
Copy link
Contributor Author

github-actions bot commented Aug 23, 2024

Pushed a commit to update the checked-in dependencies. Please mark the PR as ready for review to trigger PR checks.
@angelapwen angelapwen marked this pull request as ready for review August 23, 2024 22:09
@angelapwen angelapwen requested a review from a team as a code owner August 23, 2024 22:10
@angelapwen angelapwen merged commit e8b34a2 into releases/v2 Aug 23, 2024
@angelapwen angelapwen deleted the backport-v2.26.5-2c779ab0d branch August 23, 2024 22:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

1 participant

@angelapwen