Skip to content
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

Implement conf that avoids binary skipping in the graph #14466

Merged
merged 8 commits into from
Aug 23, 2023
Merged

Implement conf that avoids binary skipping in the graph #14466

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
704faad
Implement conf that avoids binary skipping in the graph
AbrilRBS Aug 11, 2023
f10fe80
Move to tools.graph:skip_binaries for finer grained control
AbrilRBS Aug 16, 2023
f2fd3a4
Different versions to clarify test
AbrilRBS Aug 16, 2023
8dd1f5d
Duplicated test
AbrilRBS Aug 17, 2023
d8c2f6d
Merge branch 'release/2.0' into rr/avoid-skipping-conf
AbrilRBS Aug 17, 2023
4a7d38e
Add description for conf
AbrilRBS Aug 18, 2023
c2de0e3
Better conf description
AbrilRBS Aug 21, 2023
27e95d5
Merge branch 'release/2.0' into rr/avoid-skipping-conf
AbrilRBS Aug 23, 2023
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
3 changes: 2 additions & 1 deletion conans/client/graph/graph_binaries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,8 @@ def evaluate_graph(self, deps_graph, build_mode, lockfile, remotes, update, buil
continue
self._evaluate_node(node, build_mode)

self._skip_binaries(deps_graph)
if self._cache.new_config.get("core.graph:skip_binaries", check_type=bool, default=True):
self._skip_binaries(deps_graph)

@staticmethod
def _skip_binaries(graph):
Expand Down
2 changes: 2 additions & 0 deletions conans/model/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
"core.download:retry_wait": "Seconds to wait between download attempts from Conan server",
"core.download:download_cache": "Define path to a file download cache",
"core.cache:storage_path": "Absolute path where the packages and database are stored",
# TODO. Find better name
"core.graph:skip_binaries": "Lorem Ipsum",
# Sources backup
"core.sources:download_cache": "Folder to store the sources backup",
"core.sources:download_urls": "List of URLs to download backup sources from",
Expand Down
8 changes: 8 additions & 0 deletions conans/test/integration/graph/test_skip_binaries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ def test_private_skip():
client.run("create . --name=app --version=1.0 -v")
client.assert_listed_binary({"dep/1.0": (NO_SETTINGS_PACKAGE_ID, "Skip")})

# Ensure the skip_binaries conf is able to avoid skips
client.save_home({"global.conf": "core.graph:skip_binaries=False"})
client.save({"conanfile.py": GenConanfile()})
client.run("create . --name=dep --version=1.0")
client.save({"conanfile.py": GenConanfile().with_requires("pkg/1.0")})
client.run("create . --name=app --version=1.0 -v")
client.assert_listed_binary({"dep/1.0": (NO_SETTINGS_PACKAGE_ID, "Cache")})


def test_private_no_skip():
# app -> pkg -(private)-> dep
Expand Down