Skip to content

Commit

Permalink
Merge pull request #2863 from conan-io/master
Browse files Browse the repository at this point in the history
Master to develop
  • Loading branch information
czoido authored Dec 21, 2022
2 parents 49adfe3 + 357861e commit ff35efd
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
1 change: 1 addition & 0 deletions .ci/publish.jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

// TODO: Move to a file and avoid modifying CI script
Map<String, String> versions = [
'release/1.56.0': '1.56',
'release/1.55.0': '1.55',
'release/1.54.0': '1.54',
'release/1.53.0': '1.53',
Expand Down
12 changes: 11 additions & 1 deletion changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,19 @@ Check https://github.com/conan-io/conan for issues and more details about develo

.. important::

Conan 1.55 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please submit
Conan 1.56 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please submit
a report on GitHub. Read more about the :ref:`Conan stability commitment<stability>`.

1.56.0 (21-Dec-2022)
--------------------

- Fix: Avoid extra line end while printing files with :command:`conan get`. `#12717 <https://github.com/conan-io/conan/pull/12717>`_
- Fix: Fix new Environment `.ps1` files when spaces in path `#12653 <https://github.com/conan-io/conan/pull/12653>`_
- Bugfix: Fix ``CMakeDeps`` when a ``tool_requires`` needs to be built from source and it has transitive dependencies that are regular ``requires``. `#12736 <https://github.com/conan-io/conan/pull/12736>`_
- Bugfix: Fix issue in `fix_apple_shared_install_name` when libdirs or bindirs have subfolders. `#12732 <https://github.com/conan-io/conan/pull/12732>`_
- Bugfix: Fix issue with `PkgConfigDeps` not creating `.pc` files in build context. `#12712 <https://github.com/conan-io/conan/pull/12712>`_
- Bugfix: Fix issue with `CMakeDeps` not creating `xxx-config.cmake` files in build context. `#12675 <https://github.com/conan-io/conan/pull/12675>`_

1.55.0 (30-Nov-2022)
--------------------

Expand Down
4 changes: 2 additions & 2 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
]

# The short X.Y version.
version = "1.55"
version = "1.56"
# The full version, including alpha/beta/rc tags.
release = u'1.55.0'
release = u'1.56.0'

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

0 comments on commit ff35efd

Please sign in to comment.