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

#5101 Export detected_os from OSS Tools #5102

Merged
merged 2 commits into from May 22, 2019

Conversation

Projects
None yet
3 participants
@uilianries
Copy link
Member

commented May 6, 2019

Add alias for tools.oss.detected_os

Changelog: Fix: Export detected_os from tools.oss (#5101)
Docs: conan-io/docs#1276
fixes #5101

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

#5101 Export detected_os from OSS Tools
- Add alias for tools.oss.detected_os

Signed-off-by: Uilian Ries <uilianries@gmail.com>

@ghost ghost assigned uilianries May 6, 2019

@ghost ghost added the stage: review label May 6, 2019

@uilianries

This comment has been minimized.

Copy link
Member Author

commented May 6, 2019

What? migration test error? But my patch is only about an unit test ... Go home Jenkins, you are drunk

https://conan-ci.jfrog.info/blue/organizations/jenkins/ConanTestSuite/detail/PR-5102/1/pipeline#step-131-log-1309

@lasote lasote added this to the 1.16 milestone May 21, 2019

@lasote

This comment has been minimized.

Copy link
Contributor

commented May 21, 2019

Merge develop to get rid of that error.

@lasote

lasote approved these changes May 21, 2019

@lasote lasote assigned jgsogo and unassigned uilianries May 21, 2019

@jgsogo

This comment has been minimized.

Copy link
Member

commented May 22, 2019

@uilianries, please merge upstream, it should solve the error in CI. Thanks!

@uilianries

This comment has been minimized.

Copy link
Member Author

commented May 22, 2019

@jgsogo done! let's see the result :)

@jgsogo

jgsogo approved these changes May 22, 2019

@jgsogo jgsogo merged commit e39866a into conan-io:develop May 22, 2019

2 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
license/cla Contributor License Agreement is signed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.