-
Notifications
You must be signed in to change notification settings - Fork 361
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
Update lockfile bundle docs for 1.34.1 #2040
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
czoido
added a commit
that referenced
this pull request
Mar 30, 2021
czoido
added a commit
that referenced
this pull request
Mar 30, 2021
* buildroot.rst: Fix a typo (#1996) Artifatory --> Artifactory * - meson : add target argument (#2011) Signed-off-by: SSE4 <tomskside@gmail.com> * Update develop with master (#2020) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> * Fix multiple minor spelling mistakes (#2019) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix multiple minor spelling mistakes * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Rename QbsToolchain to QbsProfile (#2027) * Rename QbsToolchain to QbsProfile * Rename use_profile to profile * conan_v2_error update (#2031) * lock bundle (#2030) * lock bundle * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Merge master to develop (#2033) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Remove misleading message about ConanCenter in shared_library_package_id() (#2000) * Update yocto docs (#2022) * Troubleshooting: How to fix incompatible requirements (#2016) * How to solve incompatible requirements Signed-off-by: Uilian Ries <uilianries@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst * Fix bad indentation Signed-off-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Uilian Ries <uilianries@gmail.com> * Merge master to develop (#2036) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Remove misleading message about ConanCenter in shared_library_package_id() (#2000) * Update yocto docs (#2022) * Troubleshooting: How to fix incompatible requirements (#2016) * How to solve incompatible requirements Signed-off-by: Uilian Ries <uilianries@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst * Fix bad indentation Signed-off-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Release 1.34.0 (#2035) * buildroot.rst: Fix a typo (#1996) Artifatory --> Artifactory * - meson : add target argument (#2011) Signed-off-by: SSE4 <tomskside@gmail.com> * Update develop with master (#2020) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> * Fix multiple minor spelling mistakes (#2019) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix multiple minor spelling mistakes * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Rename QbsToolchain to QbsProfile (#2027) * Rename QbsToolchain to QbsProfile * Rename use_profile to profile * conan_v2_error update (#2031) * lock bundle (#2030) * lock bundle * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * release 1.34.0 * fix changelog * Merge master to release branch (#2034) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Remove misleading message about ConanCenter in shared_library_package_id() (#2000) * Update yocto docs (#2022) * Troubleshooting: How to fix incompatible requirements (#2016) * How to solve incompatible requirements Signed-off-by: Uilian Ries <uilianries@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst * Fix bad indentation Signed-off-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: rico-chet <rico-chet@users.noreply.github.com> Co-authored-by: SSE4 <tomskside@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Psy-Kai <psykai1993@googlemail.com> Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: rico-chet <rico-chet@users.noreply.github.com> Co-authored-by: SSE4 <tomskside@gmail.com> Co-authored-by: Psy-Kai <psykai1993@googlemail.com> * update constrained settings example error message (#2032) * Make the instructions in the note about gcc libcxx ABI compatibility more explicit. (#2037) * More explicit instructions on the Getting Started page * Provide a command to check gccs default configuration value on the Manage gcc >= 5 ABI page. * - document custom template definitions (#2051) Signed-off-by: SSE4 <tomskside@gmail.com> * Docs for lockfiles features from 1.35 (#2053) * modify command reference * update lock reference * wip * document clean-modified for lockfiles * update bundle docs * document conan lock install * Docs for automatically handle CONAN_RUN_TESTS environment variable (#2056) * wip * wip * update bh docs * Add docs for CMAKE_SH and data in cmakedeps (#2055) * Add docs for CMAKE_SH and data in cmakedeps * remove note box * Update lockfile bundle docs for 1.34.1 (#2040) (#2058) * Update lockfile bundle docs for 1.34.1 * Remove erroneous colon Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: Jerry Wiltse <jerrywiltse@gmail.com> * update cconf (#2059) * add confs (#2061) * docs for new msbuilddeps transitivity (#2052) * docs for new msbuilddeps transitivity * fix ci Co-authored-by: czoido <mrgalleta@gmail.com> * add docs for patches (#2062) * autotools docs (#2057) * autotools docs * add marker Co-authored-by: czoido <mrgalleta@gmail.com> * Feature/tools virtualenv (#2060) * add virtualenv and environment docs * removing env from .gitignore * fix contents Co-authored-by: czoido <mrgalleta@gmail.com> * [conf] to define vs version for msvc (#2054) * [conf] to define vs version for msvc * notes about ``conanvcvars.bat`` file creation * fix ci * Update reference/config_files/settings.yml.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * add to conf Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * version 1.35.0 * update changelog Co-authored-by: rico-chet <rico-chet@users.noreply.github.com> Co-authored-by: SSE4 <tomskside@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Psy-Kai <psykai1993@googlemail.com> Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: melak47 <melak47@users.noreply.github.com> Co-authored-by: jsinge <jonsinge@freenet.de> Co-authored-by: Jerry Wiltse <jerrywiltse@gmail.com>
czoido
added a commit
that referenced
this pull request
Mar 30, 2021
* Update lockfile bundle docs for 1.34.1 (#2040) * Update lockfile bundle docs for 1.34.1 * Remove erroneous colon Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Release/1.35.0 (#2063) * buildroot.rst: Fix a typo (#1996) Artifatory --> Artifactory * - meson : add target argument (#2011) Signed-off-by: SSE4 <tomskside@gmail.com> * Update develop with master (#2020) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> * Fix multiple minor spelling mistakes (#2019) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix multiple minor spelling mistakes * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Rename QbsToolchain to QbsProfile (#2027) * Rename QbsToolchain to QbsProfile * Rename use_profile to profile * conan_v2_error update (#2031) * lock bundle (#2030) * lock bundle * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Merge master to develop (#2033) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Remove misleading message about ConanCenter in shared_library_package_id() (#2000) * Update yocto docs (#2022) * Troubleshooting: How to fix incompatible requirements (#2016) * How to solve incompatible requirements Signed-off-by: Uilian Ries <uilianries@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst * Fix bad indentation Signed-off-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Uilian Ries <uilianries@gmail.com> * Merge master to develop (#2036) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Remove misleading message about ConanCenter in shared_library_package_id() (#2000) * Update yocto docs (#2022) * Troubleshooting: How to fix incompatible requirements (#2016) * How to solve incompatible requirements Signed-off-by: Uilian Ries <uilianries@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst * Fix bad indentation Signed-off-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Release 1.34.0 (#2035) * buildroot.rst: Fix a typo (#1996) Artifatory --> Artifactory * - meson : add target argument (#2011) Signed-off-by: SSE4 <tomskside@gmail.com> * Update develop with master (#2020) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> * Fix multiple minor spelling mistakes (#2019) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix multiple minor spelling mistakes * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Rename QbsToolchain to QbsProfile (#2027) * Rename QbsToolchain to QbsProfile * Rename use_profile to profile * conan_v2_error update (#2031) * lock bundle (#2030) * lock bundle * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * release 1.34.0 * fix changelog * Merge master to release branch (#2034) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Remove misleading message about ConanCenter in shared_library_package_id() (#2000) * Update yocto docs (#2022) * Troubleshooting: How to fix incompatible requirements (#2016) * How to solve incompatible requirements Signed-off-by: Uilian Ries <uilianries@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update faq/troubleshooting.rst * Fix bad indentation Signed-off-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: rico-chet <rico-chet@users.noreply.github.com> Co-authored-by: SSE4 <tomskside@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Psy-Kai <psykai1993@googlemail.com> Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: rico-chet <rico-chet@users.noreply.github.com> Co-authored-by: SSE4 <tomskside@gmail.com> Co-authored-by: Psy-Kai <psykai1993@googlemail.com> * update constrained settings example error message (#2032) * Make the instructions in the note about gcc libcxx ABI compatibility more explicit. (#2037) * More explicit instructions on the Getting Started page * Provide a command to check gccs default configuration value on the Manage gcc >= 5 ABI page. * - document custom template definitions (#2051) Signed-off-by: SSE4 <tomskside@gmail.com> * Docs for lockfiles features from 1.35 (#2053) * modify command reference * update lock reference * wip * document clean-modified for lockfiles * update bundle docs * document conan lock install * Docs for automatically handle CONAN_RUN_TESTS environment variable (#2056) * wip * wip * update bh docs * Add docs for CMAKE_SH and data in cmakedeps (#2055) * Add docs for CMAKE_SH and data in cmakedeps * remove note box * Update lockfile bundle docs for 1.34.1 (#2040) (#2058) * Update lockfile bundle docs for 1.34.1 * Remove erroneous colon Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: Jerry Wiltse <jerrywiltse@gmail.com> * update cconf (#2059) * add confs (#2061) * docs for new msbuilddeps transitivity (#2052) * docs for new msbuilddeps transitivity * fix ci Co-authored-by: czoido <mrgalleta@gmail.com> * add docs for patches (#2062) * autotools docs (#2057) * autotools docs * add marker Co-authored-by: czoido <mrgalleta@gmail.com> * Feature/tools virtualenv (#2060) * add virtualenv and environment docs * removing env from .gitignore * fix contents Co-authored-by: czoido <mrgalleta@gmail.com> * [conf] to define vs version for msvc (#2054) * [conf] to define vs version for msvc * notes about ``conanvcvars.bat`` file creation * fix ci * Update reference/config_files/settings.yml.rst Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * add to conf Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * version 1.35.0 * update changelog Co-authored-by: rico-chet <rico-chet@users.noreply.github.com> Co-authored-by: SSE4 <tomskside@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Psy-Kai <psykai1993@googlemail.com> Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: melak47 <melak47@users.noreply.github.com> Co-authored-by: jsinge <jonsinge@freenet.de> Co-authored-by: Jerry Wiltse <jerrywiltse@gmail.com> Co-authored-by: Jerry Wiltse <jerrywiltse@gmail.com> Co-authored-by: rico-chet <rico-chet@users.noreply.github.com> Co-authored-by: SSE4 <tomskside@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Psy-Kai <psykai1993@googlemail.com> Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: melak47 <melak47@users.noreply.github.com> Co-authored-by: jsinge <jonsinge@freenet.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.