Skip to content

Merge releases/v3 into releases/v2 #2164

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
Closed
github-actions wants to merge 21 commits into from
Closed

Merge releases/v3 into releases/v2 #2164

github-actions wants to merge 21 commits into from

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Feb 23, 2024

Merging 47b3d88 into releases/v2.

Conductor for this PR is @smowton.

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 19 commits February 20, 2024 20:58
@github-actions
Update default bundle to codeql-bundle-v2.16.3
1c652cd
@github-actions
Add changelog note
5a96876
@github-actions
Update changelog and version after v3.24.4
9467b48
@smowton
Merge branch 'main' into update-bundle/codeql-bundle-v2.16.3
2a15560
@smowton
Merge pull request #2156 from github/update-bundle/codeql-bundle-v2.16.3
88189dc 
Update default bundle to 2.16.3
@github-actions
Update checked-in dependencies
c9f3eed
@nickfyson
Merge branch 'main' into mergeback/v3.24.4-to-main-e2e140ad
9bce06d
@nickfyson
Merge pull request #2158 from github/mergeback/v3.24.4-to-main-e2e140ad
908a883 
Mergeback v3.24.4 refs/heads/releases/v3 into main
@mbg
Use Go 1.22 in workflows
5d55901
@mbg
Add comment justifying why we set cache: false
e3a86ed
@mbg
Merge pull request #2060 from github/mbg/go/1.22
2896599 
Use Go 1.22 in workflows
@henrymercer
Enable C++ deptrace when using autobuild build mode
aeb89ef
@henrymercer
Merge pull request #2160 from github/henrymercer/deptrace-with-build-…
a74dcdb 
…mode

Enable C++ deptrace when using autobuild build mode
@github-actions
Update changelog for v3.24.5
28c2900
@smowton
Merge pull request #2162 from github/update-v3.24.5-a74dcdb05
47b3d88 
Merge main into releases/v3
@github-actions
Revert "Update version and changelog for v2.24.4"
8ea0088 
This reverts commit 8b0f3e6.
@github-actions
Revert "Update checked-in dependencies"
0b85c6d 
This reverts commit b882b63.
@github-actions
Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24…
64f7d52 
….5-47b3d888f
@github-actions
Update version and changelog for v2.24.5
4ec77c1
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Feb 23, 2024
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Feb 23, 2024
@github-actions
Copy link
Contributor Author

github-actions bot commented Feb 23, 2024

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

nickfyson
nickfyson requested changes Feb 23, 2024
View reviewed changes
Copy link
Contributor

@nickfyson nickfyson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a bit of a problem with the changelog on the releases/v3 branch, we should hold off on this backport till we've fixed that (and then we should get a new PR that includes the fixed changelog)

@smowton smowton closed this Feb 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickfyson nickfyson nickfyson requested changes

Assignees

@smowton smowton

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@nickfyson @smowton @mbg @henrymercer