Skip to content

Conan: Add support for Conan lockfiles #6254

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

Jump to bottom
Merged
merged 1 commit into from
Jan 23, 2023
Merged

Conan: Add support for Conan lockfiles #6254

merged 1 commit into from
Jan 23, 2023

Conversation

yarosevych
Copy link
Contributor

@yarosevych yarosevych commented Dec 19, 2022 •
edited
Loading

Require a lockfile if a path to the lockfile is configured in config.yml.

Only lockfiles located in the same directory as the definition file are
supported.

The test for Conan lockfiles cannot complete successfully when ran
locally as package id differs depending on operating system. The
package id in the test is set to the one calculated on Linux.

Signed-off-by: Oleksandr Yarosevych [email protected]

github-advanced-security[bot]
github-advanced-security bot found potential problems Dec 22, 2022
View reviewed changes
@yarosevych yarosevych force-pushed the conan-lock-files branch 2 times, most recently from ae5dd2b to 8bca1bf Compare January 13, 2023 11:57
@yarosevych yarosevych marked this pull request as ready for review January 13, 2023 11:58
@yarosevych yarosevych requested a review from a team as a code owner January 13, 2023 11:58
@yarosevych yarosevych force-pushed the conan-lock-files branch 4 times, most recently from d4e50c1 to 677e123 Compare January 13, 2023 13:05
MarcelBochtler
MarcelBochtler requested changes Jan 13, 2023
View reviewed changes
MarcelBochtler
MarcelBochtler requested changes Jan 13, 2023
View reviewed changes
MarcelBochtler
MarcelBochtler previously approved these changes Jan 17, 2023
View reviewed changes
Copy link
Member

@MarcelBochtler MarcelBochtler left a comment

Choose a reason for hiding this comment

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

LGTM.
@sschuberth I think the commitlint check fails because @yarosevych's sign-off is too long. Do you know of a way to allow this?

@sschuberth
Copy link
Member

sschuberth commented Jan 17, 2023 •
edited
Loading

@sschuberth I think the commitlint check fails because @yarosevych's sign-off is too long. Do you know of a way to allow this?

It should default to Infinity, strange. Can you try explicitly setting it as part of this PR?

mnonnenmacher
mnonnenmacher requested changes Jan 17, 2023
View reviewed changes
@MarcelBochtler MarcelBochtler self-requested a review January 17, 2023 13:52
@yarosevych yarosevych requested review from mnonnenmacher and removed request for MarcelBochtler January 17, 2023 15:56
github-advanced-security[bot]
github-advanced-security bot found potential problems Jan 17, 2023
View reviewed changes
mnonnenmacher
mnonnenmacher requested changes Jan 18, 2023
View reviewed changes
@yarosevych yarosevych force-pushed the conan-lock-files branch 2 times, most recently from d0086f2 to 98374ab Compare January 18, 2023 15:06
@yarosevych
Copy link
Contributor Author

@sschuberth I think the commitlint check fails because @yarosevych's sign-off is too long. Do you know of a way to allow this?

It should default to Infinity, strange. Can you try explicitly setting it as part of this PR?

This issue is caused by commitlint treating the "Signed-off-by" footer as a commit body line, according to the error: body's lines must not be longer than 75 characters [body-max-line-length]. The issue is reported here: conventional-changelog/commitlint#3411

@sschuberth sschuberth mentioned this pull request Jan 19, 2023
Closed
@mnonnenmacher
Copy link
Member

mnonnenmacher commented Jan 19, 2023 •
edited
Loading

@sschuberth I think the commitlint check fails because @yarosevych's sign-off is too long. Do you know of a way to allow this?

It should default to Infinity, strange. Can you try explicitly setting it as part of this PR?

This issue is caused by commitlint treating the "Signed-off-by" footer as a commit body line, according to the error: body's lines must not be longer than 75 characters [body-max-line-length]. The issue is reported here: conventional-changelog/commitlint#3411

@yarosevych I have added a commit to #6366 that configures commitlint to treat "Signed-off-by" lines as footers, you can rebase once the PR is merged.

mnonnenmacher
mnonnenmacher requested changes Jan 19, 2023
View reviewed changes
github-advanced-security[bot]
github-advanced-security bot found potential problems Jan 19, 2023
View reviewed changes
mnonnenmacher
mnonnenmacher requested changes Jan 23, 2023
View reviewed changes
@yarosevych yarosevych requested review from mnonnenmacher and removed request for MarcelBochtler January 23, 2023 13:49
@yarosevych
feat(Conan): Add support for Conan lockfiles
14a7028 
Require a lockfile if a path to the lockfile is configured in
`config.yml`.

Only lockfiles located in the same directory as the definition file are
supported.

The test for Conan lockfiles is configured to only run on Linux as
`package id` in the lockfile differs depending on operating system.

Signed-off-by: Oleksandr Yarosevych <[email protected]>
@sschuberth
Copy link
Member

Merging despite the unrelated SW360 test failures, see https://www.eclipsestatus.io/.

@sschuberth sschuberth merged commit 3cf7f9e into oss-review-toolkit:main Jan 23, 2023
@sschuberth sschuberth mentioned this pull request Jan 26, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sschuberth sschuberth sschuberth left review comments

@mnonnenmacher mnonnenmacher mnonnenmacher approved these changes

@MarcelBochtler MarcelBochtler Awaiting requested review from MarcelBochtler

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@yarosevych @sschuberth @mnonnenmacher @MarcelBochtler