Skip to content

Merge rc/3.18 back to main - #19699

Merged
cklin merged 5 commits into
mainfrom
cklin/rc-3.18-mergeback
Jun 9, 2025
Merged

Merge rc/3.18 back to main#19699
cklin merged 5 commits into
mainfrom
cklin/rc-3.18-mergeback

Conversation

@cklin

@cklincklin commented Jun 9, 2025

Copy link
Copy Markdown
Contributor

No description provided.

@cklin
cklin marked this pull request as ready for review June 9, 2025 14:29
CopilotAI review requested due to automatic review settings June 9, 2025 14:29
@cklin
cklin requested review from a team as code ownersJune 9, 2025 14:29

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull Request Overview

This PR merges the rc/3.18 branch back into main, updating package versions and consolidating release notes.

  • Bumps development versions and last-release tags for C++ QL and Actions QL packs.
  • Adds consolidated 1.4.1 and 5.0.0 release notes and corresponding CHANGELOG entries.
  • Removes individual daily change-note stubs now covered by the 5.0.0 notes.

Reviewed Changes

Copilot reviewed 174 out of 174 changed files in this pull request and generated no comments.

Show a summary per file
FileDescription
cpp/ql/src/change-notes/released/1.4.1.mdAdded release notes for version 1.4.1
cpp/ql/src/CHANGELOG.mdAdded 1.4.1 entry to CHANGELOG
cpp/ql/lib/qlpack.ymlBumped codeql/cpp-all dev version to 5.0.1-dev
cpp/ql/lib/codeql-pack.release.ymlUpdated lastReleaseVersion to 5.0.0
cpp/ql/lib/change-notes/released/5.0.0.mdAdded consolidated release notes for version 5.0.0
cpp/ql/lib/CHANGELOG.mdAdded 5.0.0 entry to lib CHANGELOG
cpp/ql/lib/change-notes/2025-05-27-windows-sources-2.md (and similar files)Removed individual daily change-note content
actions/ql/src/qlpack.ymlBumped codeql/actions-queries dev version to 0.6.3-dev
actions/ql/src/codeql-pack.release.ymlUpdated lastReleaseVersion to 0.6.2
actions/ql/src/change-notes/released/0.6.2.mdAdded release notes for version 0.6.2
actions/ql/src/CHANGELOG.mdAdded 0.6.2 entry to Actions CHANGELOG
actions/ql/lib/qlpack.ymlBumped codeql/actions-all dev version to 0.4.11-dev
actions/ql/lib/codeql-pack.release.ymlUpdated lastReleaseVersion to 0.4.10
actions/ql/lib/change-notes/released/0.4.10.mdAdded release notes for version 0.4.10
actions/ql/lib/CHANGELOG.mdAdded 0.4.10 entry to lib CHANGELOG
Comments suppressed due to low confidence (7)

cpp/ql/lib/change-notes/released/5.0.0.md:1

  • Include a YAML front-matter block (e.g., ---- followed by -category: <type> and ----) at the top of this release note file to keep formatting consistent with other change-notes/released files.
## 5.0.0

cpp/ql/lib/change-notes/2025-05-27-windows-sources-2.md:1

  • This file is now empty after merging its content into the 5.0.0 release notes; consider deleting it to avoid orphaned files.
----

cpp/ql/lib/change-notes/2025-05-23-windows-sources.md:1

  • This file is now empty after merging its content into the 5.0.0 release notes; consider deleting it to avoid orphaned files.
----

cpp/ql/lib/change-notes/2025-05-18-2025-May-outdated-deprecations.md:1

  • This file is now empty after merging its content into the 5.0.0 release notes; consider deleting it to avoid orphaned files.
----

cpp/ql/lib/change-notes/2025-05-16-wmain-support.md:1

  • This file is now empty after merging its content into the 5.0.0 release notes; consider deleting it to avoid orphaned files.
----

cpp/ql/lib/change-notes/2025-05-16-array-aggregate-literals.md:1

  • This file is now empty after merging its content into the 5.0.0 release notes; consider deleting it to avoid orphaned files.
----

cpp/ql/lib/change-notes/2025-05-15-class-aggregate-literals.md:1

  • This file is now empty after merging its content into the 5.0.0 release notes; consider deleting it to avoid orphaned files.
----

@cklin
cklin merged commit 68d2c13 into mainJun 9, 2025
@cklin
cklin deleted the cklin/rc-3.18-mergeback branch June 9, 2025 15:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ActionsAnalysis of GitHub ActionsC#C++DataFlow LibrarydocumentationGoJavaJSPythonRubyRustPull requests that update Rust codeSwift

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@cklin@jketema@henrymercer