chore(conan): Update test fixture #8758
Merged
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #8758 +/- ##
=========================================
Coverage 67.64% 67.64%
Complexity 1168 1168
=========================================
Files 244 244
Lines 7783 7783
Branches 867 867
=========================================
Hits 5265 5265
Misses 2161 2161
Partials 357 357
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
sschuberth
reviewed
Jun 13, 2024
...ns/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-py.yml
Show resolved
Hide resolved
rettichschnidi
force-pushed
the
gardena/rs/upstream/conan-2-compatibility-poco-update
branch
from
503ff8e to
1b73007
Compare
sschuberth
reviewed
Jun 19, 2024
...ns/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-py.yml
Show resolved
Hide resolved
...ns/package-managers/conan/src/funTest/assets/projects/synthetic/conan-expected-output-py.yml
Outdated
Show resolved
Hide resolved
rettichschnidi
force-pushed
the
gardena/rs/upstream/conan-2-compatibility-poco-update
branch
from
1b73007 to
57cc78b
Compare
sschuberth
reviewed
Aug 8, 2024
| @@ -1,36 +1,197 @@ | |||
| --- | |||
| project: | |||
| id: "Conan::Poco:1.9.3" | |||
| id: "Conan::poco:null" | |||
There was a problem hiding this comment.
We should actually never get null for the version of a project. Let me take over your PR and fix this on top of it. Nothing to be done from your side @rettichschnidi.
There was a problem hiding this comment.
@rettichschnidi have you checked "Allow edits from maintainers" for your PR?
There was a problem hiding this comment.
Unfortunately, https://github.com/husqvarnagroup is an organization, and "Allow edits from Maintainers" does not yet work for organization.
I guess best would be to close this PR and you creating a new one?
rettichschnidi
force-pushed
the
gardena/rs/upstream/conan-2-compatibility-poco-update
branch
from
57cc78b to
63ab950
Compare
This change is a (not strictly needed) preparation for Conan 2.x support in ORT. Updating the Poco recipe to the current version offered by the Conan Center Index [1] allows it to work with both version 1.x and 2.x of Conan. The lock file has been created using Conan version 1.64.1: ```shell rm -rf ~/.conan/data conan lock create --lockfile-out lockfile.lock conanfile.py ``` [1]: https://github.com/conan-io/conan-center-index/blob/8450018b1ce8eb8c8cf38a3412d2915fd2e3e829/recipes/poco/all/conanfile.py Signed-off-by: Reto Schneider <[email protected]> Signed-off-by: Sebastian Schuberth <[email protected]>
This is a fixup for 802dfa8. Signed-off-by: Sebastian Schuberth <[email protected]>
rettichschnidi
force-pushed
the
gardena/rs/upstream/conan-2-compatibility-poco-update
branch
from
63ab950 to
aa31790
Compare
sschuberth
approved these changes
Aug 8, 2024
rettichschnidi
deleted the
gardena/rs/upstream/conan-2-compatibility-poco-update
branch
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.
This change is a (not strictly needed) preparation for Conan 2.x support in ORT.
Updating the Poco recipe to the current version offered by the Conan Center Index allows it to work with both, version 1.x and 2.x of Conan.
The lock file has been created using Conan version 1.64.1:
rm -rf ~/.conan/data conan lock create --lockfile-out lockfile.lock conanfile.pyConan Center Index: https://github.com/conan-io/conan-center-index
Commit: f78dc3729f97c1554eae5f3843cabb2e2198c09a