You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: changelog.rst
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1242,7 +1242,7 @@ This page lists the changes made to Conan in each version, with links to each pu
1242
1242
- Fix: Fix ``AutotoolsToolchain`` definition of ``tools.build:compiler_executable`` for Windows subsystems `#13867 <https://github.com/conan-io/conan/pull/13867>`_
1243
1243
- Fix: Speed up the CMakeDeps generation `#13857 <https://github.com/conan-io/conan/pull/13857>`_
- Fix: Fail when defining an unkown conf `#13832 <https://github.com/conan-io/conan/pull/13832>`_
1245
+
- Fix: Fail when defining an unknown conf `#13832 <https://github.com/conan-io/conan/pull/13832>`_
1246
1246
- Fix: Fix incorrect printing of "skipped" binaries in the ``conan install/create`` commands, when they are used by some other dependencies. `#13778 <https://github.com/conan-io/conan/pull/13778>`_
1247
1247
- Fix: Renaming the cache "deploy" folder to "deployers" and allow ``-d, --deployer`` cli arg. ("deploy" folder will not break but will warn as deprecated). `#13740 <https://github.com/conan-io/conan/pull/13740>`_ . Docs `here <https://github.com/conan-io/docs/pull/3209>`__
1248
1248
- Fix: Omit ``-L`` libpaths in ``CMakeDeps`` for header-only libraries. `#13704 <https://github.com/conan-io/conan/pull/13704>`_
Copy file name to clipboardExpand all lines: ci_tutorial/products_pipeline/full_pipeline.rst
+3-3Lines changed: 3 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -298,15 +298,15 @@ The focus of this CI tutorial is to introduce some important concepts, good prac
298
298
- How large dependency graphs can be built efficiently in CI with the ``conan graph build-order``, and how build-orders for different configurations and products can be merged together.
299
299
- Why ``lockfiles`` are necessary in CI when there are concurrent CI builds.
300
300
- The importance of versioning, and the role of ``package_id`` to re-build only what is necessary in large dependency graphs.
301
-
- Not using ``user/channel`` as variable and dynamic qualifiers of packages that change accross the CI pipeline, but using instead different server repositories.
302
-
- Running package promotions (copies) accross server repositories when new package versions are validated.
301
+
- Not using ``user/channel`` as variable and dynamic qualifiers of packages that change across the CI pipeline, but using instead different server repositories.
302
+
- Running package promotions (copies) across server repositories when new package versions are validated.
303
303
304
304
305
305
There are still many implementation details, strategies, use cases, and error scenarios that are not covered in this tutorial yet:
306
306
307
307
- How to integrate breaking changes of a package that requires a new breaking major version.
308
308
- Different versioning strategies, using pre-releases, using versions or relying on recipe revisions in certain cases.
309
-
- How lockfiles can be stored and used accross different builds, if it is good to persist them and where.
309
+
- How lockfiles can be stored and used across different builds, if it is good to persist them and where.
310
310
- Different branching and merging strategies, nightly builds, releases flows.
311
311
312
312
We plan to extend this CI tutorial, including more examples and use cases. If you have any question or feedback, please create a ticket in https://github.com/conan-io/conan/issues.
Copy file name to clipboardExpand all lines: devops/metadata.rst
+3-3Lines changed: 3 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -102,7 +102,7 @@ you can copy it after the ``conan export-pkg`` using the paths reported by ``con
102
102
103
103
Creating metadata with hooks
104
104
----------------------------
105
-
If there is some common metadata accross recipes, it is possible to capture it without modifying the recipes, using hooks.
105
+
If there is some common metadata across recipes, it is possible to capture it without modifying the recipes, using hooks.
106
106
Let's say that we have a simpler recipe:
107
107
108
108
.. code-block:: python
@@ -270,7 +270,7 @@ Removing metadata
270
270
-----------------
271
271
At the moment it is not possible to remove metadata from the server side using Conan, as the metadata are "additive", it is possible to add new data, but not to remove it (otherwise it would not be possible to add new metadata without downloading first all the previous metadata, and that can be quite inefficient and more error prone, specially sensitive to possible race conditions).
272
272
273
-
The recommendation to remove metatada from the server side would be to use the tools, web interface or APIs that the server might provide.
273
+
The recommendation to remove metadata from the server side would be to use the tools, web interface or APIs that the server might provide.
274
274
275
275
.. note::
276
276
@@ -279,7 +279,7 @@ The recommendation to remove metatada from the server side would be to use the t
279
279
- Metadata shouldn't be necessary for using packages. It should be possible to consume recipes and packages without downloading their
280
280
metadata. If metadata is mandatory for a package to be used, then it is not metadata and should be packaged as headers and binaries.
281
281
- Metadata reading access should not be a frequent operation, or something that developers have to do. Metadata read is intended for
282
-
excepcional cases, when some build logs need to be recovered for compliance, or some test executables might be needed for debugging or
282
+
exceptional cases, when some build logs need to be recovered for compliance, or some test executables might be needed for debugging or
283
283
re-checking a crash.
284
284
- Conan does not do any compression or decompression of the metadata files. If there are a lot of metadata files, consider zipping them yourself, otherwise the upload of those many files can take a lot of time. If you need to handle different types of metadata (logs, tests, reports), zipping the files under each category might be better to be able to filter with the ``--metadata=xxx`` argument.
Copy file name to clipboardExpand all lines: devops/save_restore.rst
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -7,7 +7,7 @@ Save and restore packages from/to the cache
7
7
8
8
With the ``conan cache save`` and ``conan cache restore`` commands, it is possible to create a .tgz from one or several packages from a Conan cache and later restore those packages into another Conan cache. There are some scenarios this can be useful:
9
9
10
-
- In Continuous Integration, specially if doing distributed builds, it might be very convenient to be able to move temporary packages recently built. Most CI systems have the capability of transferring files between jobs for this purpose. The Conan cache is not concurrent, sometimes for paralllel jobs different caches have to be used.
10
+
- In Continuous Integration, specially if doing distributed builds, it might be very convenient to be able to move temporary packages recently built. Most CI systems have the capability of transferring files between jobs for this purpose. The Conan cache is not concurrent, sometimes for parallel jobs different caches have to be used.
11
11
- For air-gapped setups, in which packages can only be transferred via client side.
12
12
- Developers directly sharing some packages with other developers for testing or inspection.
Copy file name to clipboardExpand all lines: incubating.rst
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -19,7 +19,7 @@ This generator is designed as a replacement of the current ``CMakeDeps`` generat
19
19
- Definition of IMPORTED_LOCATION and IMPORTED_IMPLIB for library targets.
20
20
- Definition of LINK_LANGUAGES based on the recipe ``languages`` and ``cpp_info/component`` ``languages`` properties.
21
21
- All these allows better propagation of linkage requirement and visibility, avoiding some linkage error of transitive shared libraries in Linux.
22
-
- Better definition of ``requires`` relationships accross components inside the same package and with respect to other packages.
22
+
- Better definition of ``requires`` relationships across components inside the same package and with respect to other packages.
23
23
- It doesn't need any ``build_context_activated`` or ``build_context_suffix`` to use ``tool_requires`` dependencies.
24
24
- Definition of ``cpp_info/component.exe`` information (should include the ``.location`` definition too), to define EXECUTABLE targets that can be run.
25
25
- Executables from ``requires`` can also be used in non cross-build scenarios. When a ``tool_requires`` to the same depependency exists, then those executables will have priority.
Copy file name to clipboardExpand all lines: reference/binary_model/extending.rst
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -18,12 +18,12 @@ It is possible to add new settings or subsettings in the *settings.yml* file, s
18
18
19
19
Where the ``null`` value allows leaving the setting undefined in profiles. If not including, it will be mandatory that profiles define a value for them.
20
20
21
-
The custom settings will be used explicitly or implictly in recipes and packages:
21
+
The custom settings will be used explicitly or implicitly in recipes and packages:
22
22
23
23
.. code-block:: python
24
24
25
25
classPkg(ConanFile):
26
-
# If we explicilty want this package binaries to vary according to 'new_root_setting'
26
+
# If we explicitly want this package binaries to vary according to 'new_root_setting'
0 commit comments