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 main into releases/v3 #2425

Merged
merged 6 commits into from
Aug 14, 2024
Merged

Merge main into releases/v3 #2425

merged 6 commits into from
Aug 14, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 14, 2024 •
edited by alexet
Loading

Merging a93f8c2 into releases/v3.

Conductor for this PR is @alexet.

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/v3 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • 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.
  • Merge the mergeback PR that will automatically be created once this PR is merged.
  • Merge all backport PRs to older release branches, that will automatically be created once this PR is merged.

github-actions bot and others added 6 commits August 13, 2024 20:33
@github-actions
Update changelog and version after v3.26.1
ece28a8
@rvermeulen
Reapply "Merge pull request #2417 from github/update-bundle/codeql-bu…
dd9700c 
…ndle-v2.18.2"

This reverts commit 5b15b9e.
@github-actions
Update checked-in dependencies
2bc3b83
@rvermeulen @henrymercer
Address incorrect CHANGELOG.md
af1f2e8 
The bundle update was removed from 3.26.1 and but back for the next release.

Co-authored-by: Henry Mercer <henrymercer@github.com>
@henrymercer
Merge pull request #2423 from github/mergeback/v3.26.1-to-main-29d86d22
a93f8c2 
Mergeback v3.26.1 refs/heads/releases/v3 into main
@github-actions
Update changelog for v3.26.2
9eec338
@alexet alexet marked this pull request as ready for review August 14, 2024 15:54
@alexet alexet requested a review from a team as a code owner August 14, 2024 15:54
@alexet alexet enabled auto-merge August 14, 2024 16:05
@alexet alexet merged commit 429e197 into releases/v3 Aug 14, 2024
305 checks passed
@alexet alexet deleted the update-v3.26.2-a93f8c2fd branch August 14, 2024 16:08
@github-actions github-actions bot mentioned this pull request Aug 14, 2024
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexet alexet alexet approved these changes

Assignees

@alexet alexet

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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