-
Notifications
You must be signed in to change notification settings - Fork 357
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
Merge master 1.25.0 to develop #1684
Merged
czoido
merged 25 commits into
conan-io:develop
from
czoido:merge_master_1_25_0_to_develop
May 6, 2020
Merged
Merge master 1.25.0 to develop #1684
czoido
merged 25 commits into
conan-io:develop
from
czoido:merge_master_1_25_0_to_develop
May 6, 2020
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
Co-authored-by: Daniel <danimanzaneque@gmail.com>
* Convert all references to lowercase * fix * Update developing_packages/workspaces.rst * Update developing_packages/workspaces.rst * Update howtos/manage_shared_libraries/env_vars.rst * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update devtools/build_requires.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>
…mands (conan-io#1634) * Remove linkcheck from master jobs * remove indexing stuff from deploy script * remove old gh_pages script * remove nginx script * remove make_mac * remove elastic stuff Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>
* conan-io#1506 Add Troubleshooting for duplicated package Signed-off-by: Uilian Ries <uilianries@gmail.com> * conan-io#1506 Better block format Signed-off-by: Uilian Ries <uilianries@gmail.com> * conan-io#1506 Better block format Signed-off-by: Uilian Ries <uilianries@gmail.com> * Change the perspective to transitive package Signed-off-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>
* Use the build folder to apply any patch Some motivation: conan-io/conan-center-index#1107 (comment) Signed-off-by: Uilian Ries <uilianries@gmail.com> * Update build folder comment Signed-off-by: Uilian Ries <uilianries@gmail.com> * Update reference/tools.rst Co-authored-by: Javier G. Sogo <jgsogo@gmail.com> Co-authored-by: Daniel <danimanzaneque@gmail.com>
Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>
…ence (conan-io#1487) * add matrix-params to docs * finally landed in 7.3.2 * Update reference/config_files/artifacts.properties.rst Co-Authored-By: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
Release/1.24.0
* document remotes.json * add note about metadata.josn * update docs in remote command * remove non public files * remove unneeded change Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
Co-authored-by: Daniel <danimanzaneque@gmail.com>
* Sort definitions in CMake helper * Add missing definitions to CMake helper
* bump version * add changelog
Co-authored-by: Daniel <danimanzaneque@gmail.com>
* Add info about config_install_interval (conan-io#1679) Signed-off-by: Uilian Ries <uilianries@gmail.com> * Master (conan-io#1665) * fix dupe changelog (conan-io#1617) Co-authored-by: Daniel <danimanzaneque@gmail.com> * Convert all references to lowercase (conan-io#1619) * Convert all references to lowercase * fix * Update developing_packages/workspaces.rst * Update developing_packages/workspaces.rst * Update howtos/manage_shared_libraries/env_vars.rst * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update devtools/build_requires.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> * Update creating_packages/define_abi_compatibility.rst Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com> Co-authored-by: Javier G. Sogo <jgsogo@gmail.com> * Remove linkcheck from master jobs (conan-io#1633) * Remove old stuff from building scripts: elasticsearch, old deploy commands (conan-io#1634) * Remove linkcheck from master jobs * remove indexing stuff from deploy script * remove old gh_pages script * remove nginx script * remove make_mac * remove elastic stuff Co-authored-by: Javier G. Sogo <jgsogo@gmail.com> * conan-io#1506 Add Troubleshooting for duplicated package (conan-io#1507) * conan-io#1506 Add Troubleshooting for duplicated package Signed-off-by: Uilian Ries <uilianries@gmail.com> * conan-io#1506 Better block format Signed-off-by: Uilian Ries <uilianries@gmail.com> * conan-io#1506 Better block format Signed-off-by: Uilian Ries <uilianries@gmail.com> * Change the perspective to transitive package Signed-off-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: Javier G. Sogo <jgsogo@gmail.com> * Use the build folder to apply any patch (conan-io#1605) * Use the build folder to apply any patch Some motivation: conan-io/conan-center-index#1107 (comment) Signed-off-by: Uilian Ries <uilianries@gmail.com> * Update build folder comment Signed-off-by: Uilian Ries <uilianries@gmail.com> * Update reference/tools.rst Co-authored-by: Javier G. Sogo <jgsogo@gmail.com> Co-authored-by: Daniel <danimanzaneque@gmail.com> * Remove redundant text in visualstudio.rst (conan-io#1625) Co-authored-by: Javier G. Sogo <jgsogo@gmail.com> * Add information about matrix-params in the artifacts.properties reference (conan-io#1487) * add matrix-params to docs * finally landed in 7.3.2 * Update reference/config_files/artifacts.properties.rst Co-Authored-By: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * change version and changelog * unicode char not allowed (conan-io#1649) * Updates docs related to 'remotes.json' file (conan-io#1640) * document remotes.json * add note about metadata.josn * update docs in remote command * remove non public files * remove unneeded change Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * fix python_requires_copy (conan-io#1647) Co-authored-by: Daniel <danimanzaneque@gmail.com> * add missing changelog (conan-io#1652) * Improvement/cmake helper (conan-io#1655) * Sort definitions in CMake helper * Add missing definitions to CMake helper * update example about makefiles (conan-io#1659) * new cpplang slack inviter (conan-io#1664) * fix typeo in command description (conan-io#1670) * Fix typo: it's CONAN_RUN_TESTS, not CONAN_RUN_TEST (conan-io#1671) * Release/1.24.1 (conan-io#1672) * bump version * add changelog * clarify default_package_id_mode (conan-io#1666) Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Javier G. Sogo <jgsogo@gmail.com> Co-authored-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: syntroniks <syntroniks@gmail.com> Co-authored-by: Aleksa Pavlovic <pavlovicaleksa@yahoo.com> Co-authored-by: Jerry <jerrywiltse@gmail.com> Co-authored-by: Kevin Puetz <puetzk@puetzk.org> * Documentation related to settings_build and settings_target (conan-io#1678) * documentation rleated to settings_build and settings_target * review * remove function, add comment * update version * add changelog Co-authored-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: James <james@conan.io> Co-authored-by: Daniel <danimanzaneque@gmail.com> Co-authored-by: Javier G. Sogo <jgsogo@gmail.com> Co-authored-by: syntroniks <syntroniks@gmail.com> Co-authored-by: Aleksa Pavlovic <pavlovicaleksa@yahoo.com> Co-authored-by: Jerry <jerrywiltse@gmail.com> Co-authored-by: Kevin Puetz <puetzk@puetzk.org>
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.