Skip to content

Merge releases/v3 into releases/v2 #2393

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
Merged
cklin merged 14 commits into from
Jul 26, 2024
Merged

Merge releases/v3 into releases/v2 #2393

cklin merged 14 commits into from
Jul 26, 2024

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Jul 26, 2024 •
edited by cklin
Loading

Merging afb54ba into releases/v2.

Conductor for this PR is @cklin.

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 13 commits July 23, 2024 14:36
@github-actions
Update default bundle to codeql-bundle-v2.18.1
98042e7
@github-actions
Add changelog note
736528d
@github-actions
Update changelog and version after v3.25.14
02d73d0
@github-actions
Update checked-in dependencies
9e375a8
@angelapwen
Merge pull request #2389 from github/mergeback/v3.25.14-to-main-5cf07d8b
f8e94f9 
Mergeback v3.25.14 refs/heads/releases/v3 into main
@cklin
Merge branch 'main' into update-bundle/codeql-bundle-v2.18.1
97e8f69
@cklin
Merge pull request #2385 from github/update-bundle/codeql-bundle-v2.18.1
4b1d7da 
Update default bundle to 2.18.1
@github-actions
Update changelog for v3.25.15
57a4b22
@cklin
Merge pull request #2391 from github/update-v3.25.15-4b1d7da10
afb54ba 
Merge main into releases/v3
@github-actions
Revert "Update version and changelog for v2.25.14"
9a5f548 
This reverts commit befbb8b.
@github-actions
Revert "Update checked-in dependencies"
87819ce 
This reverts commit 20f361b.
@github-actions
Merge remote-tracking branch 'origin/releases/v3' into backport-v2.25…
a8428cd 
….15-afb54ba38
@github-actions
Update version and changelog for v2.25.15
fc5bae6
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Jul 26, 2024
@cklin cklin added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels Jul 26, 2024
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Jul 26, 2024
@github-actions
Copy link
Contributor Author

github-actions bot commented Jul 26, 2024

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

@cklin cklin marked this pull request as ready for review July 26, 2024 14:21
@cklin cklin requested a review from a team as a code owner July 26, 2024 14:21
@cklin cklin merged commit 3e0e846 into releases/v2 Jul 26, 2024
@cklin cklin deleted the backport-v2.25.15-afb54ba38 branch July 26, 2024 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cklin cklin cklin approved these changes

Assignees

@cklin cklin

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@cklin @angelapwen