Skip to content

Sync develop2 with release branch #4307

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

Merged
merged 1 commit into from
Nov 10, 2025
Merged

Sync develop2 with release branch #4307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ Changelog

This page lists the changes made to Conan in each version, with links to each pull request for more details.

2.22.2 (07-Nov-2025)
--------------------

- Bugfix: Fix assert when finding compatible binaries of a package that exists in both contexts with different settings. `#19208 <https://github.com/conan-io/conan/pull/19208>`_

2.22.1 (30-Oct-2025)
--------------------

Expand Down
2 changes: 1 addition & 1 deletion conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
# The short X.Y version.
version = "2.22"
# The full version, including alpha/beta/rc tags.
release = u'2.22.1'
release = u'2.22.2'

dir_path = os.path.dirname(os.path.realpath(__file__))
if not os.path.exists(os.path.join(dir_path, "versions.json")):
Expand Down