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.

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

started with conflicts examples #2

Open
wants to merge 9 commits into
base: main
Choose a base branch
from

Conversation

memsharded
Copy link
Member

This only works after conan-io/conan#10624 is merged.

Goals:

  • Talk about repo organization
  • Talk about repo CI scripts

Copy link
Contributor

@dornbirndevelops dornbirndevelops left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice to see some examples for 2.X
really looking forward to this version 👍

@@ -0,0 +1,4 @@
from conan import ConanFile
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could not see the usage of this file in the sample execution. Is this intentional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nop, good catch.

@@ -0,0 +1,4 @@
from conan import ConanFile
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could not see the usage of this file in the sample execution. Is this intentional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same. Removing

run("conan create ai")
out = run("conan install game", error=True)
# NOTE This output shows the downstream conflict not the immediate
assert "ERROR: Version conflict: ai/1.0->math/2.0, game/1.0->math/1.0" in out
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is weird. I would have expected now something like below:

Suggested change
assert "ERROR: Version conflict: ai/1.0->math/2.0, game/1.0->math/1.0" in out
assert "ERROR: Version conflict: ai/1.0->math/2.0, engine/1.0->math/1.0" in out

what am I missing?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nop, this is the current implementation. The conflict shown is because the engine->math conflict is propagated down to game. If it wasn't propagated it wouldn't conflict, so the conflict needs to be tracked down from game.

At least this is the current implementation, we can try to improve the information there, but that would require changes in code.

This will be run by CI, so we will make sure that the examples work and they align with the release.

name = "ai"
version = "1.0"

requires = "math/2.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing newline

Copy link
Contributor

@dornbirndevelops dornbirndevelops left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice to see some examples for 2.X
really looking forward to this version 👍

Copy link
Member Author

@memsharded memsharded left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review!

@@ -0,0 +1,4 @@
from conan import ConanFile
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nop, good catch.

@@ -0,0 +1,4 @@
from conan import ConanFile
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same. Removing

run("conan create ai")
out = run("conan install game", error=True)
# NOTE This output shows the downstream conflict not the immediate
assert "ERROR: Version conflict: ai/1.0->math/2.0, game/1.0->math/1.0" in out
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nop, this is the current implementation. The conflict shown is because the engine->math conflict is propagated down to game. If it wasn't propagated it wouldn't conflict, so the conflict needs to be tracked down from game.

At least this is the current implementation, we can try to improve the information there, but that would require changes in code.

This will be run by CI, so we will make sure that the examples work and they align with the release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants