Skip to content

Merge rc/3.18 back to main #19699

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.

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

Merged
merged 5 commits into from
Jun 9, 2025
Merged

Merge rc/3.18 back to main #19699

merged 5 commits into from
Jun 9, 2025

Conversation

cklin
Copy link
Contributor

@cklin cklin commented Jun 9, 2025

No description provided.

@cklin cklin marked this pull request as ready for review June 9, 2025 14:29
@Copilot Copilot AI review requested due to automatic review settings June 9, 2025 14:29
@cklin cklin requested review from a team as code owners June 9, 2025 14:29
Copy link
Contributor

@Copilot Copilot AI left a comment

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
File Description
cpp/ql/src/change-notes/released/1.4.1.md Added release notes for version 1.4.1
cpp/ql/src/CHANGELOG.md Added 1.4.1 entry to CHANGELOG
cpp/ql/lib/qlpack.yml Bumped codeql/cpp-all dev version to 5.0.1-dev
cpp/ql/lib/codeql-pack.release.yml Updated lastReleaseVersion to 5.0.0
cpp/ql/lib/change-notes/released/5.0.0.md Added consolidated release notes for version 5.0.0
cpp/ql/lib/CHANGELOG.md Added 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.yml Bumped codeql/actions-queries dev version to 0.6.3-dev
actions/ql/src/codeql-pack.release.yml Updated lastReleaseVersion to 0.6.2
actions/ql/src/change-notes/released/0.6.2.md Added release notes for version 0.6.2
actions/ql/src/CHANGELOG.md Added 0.6.2 entry to Actions CHANGELOG
actions/ql/lib/qlpack.yml Bumped codeql/actions-all dev version to 0.4.11-dev
actions/ql/lib/codeql-pack.release.yml Updated lastReleaseVersion to 0.4.10
actions/ql/lib/change-notes/released/0.4.10.md Added release notes for version 0.4.10
actions/ql/lib/CHANGELOG.md Added 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 main Jun 9, 2025
68 checks passed
@cklin cklin deleted the cklin/rc-3.18-mergeback branch June 9, 2025 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants