fix(datasource/crate): preserve build metadata #36005
Conversation
|
|
| @@ -299,7 +299,7 @@ exports[`modules/datasource/crate/index > getReleases > processes real data: lib | |||
| "version": "0.2.50", | |||
| }, | |||
| { | |||
| "version": "0.2.51", | |||
| "version": "0.2.51+metadata", | |||
There was a problem hiding this comment.
I believe the build metadata will eventually go through applyDatasourceFilters, so should be fine here.
(though I haven't found a place to test this)
viceice
changed the title
| @@ -110,7 +110,7 @@ export class CrateDatasource extends Datasource { | |||
| result.releases = lines | |||
| .map((version) => { | |||
| const release: Release = { | |||
| version: version.vers.replace(/\+.*$/, ''), | |||
| version: version.vers, | |||
There was a problem hiding this comment.
| version: version.vers, | |
| version: version.replace(/\+.*$/, ''), | |
| versionOrig: version.vers, |
maybe we should better use gitRef here? 🤔
There was a problem hiding this comment.
Hmm... but the version string here has nothing to do with git.
There was a problem hiding this comment.
@weihanglo can you please sign the cla?
@rarkins are you fine with this solution / workaround?
otherwise LGTM
|
Signed. Thank you! |
Co-authored-by: Michael Kriese <[email protected]>
|
Just fixed I think it is ready to merge. Thank you |
|
Thanks for the review! I am not sure what went wrong in the test coverage though: https://app.codecov.io/gh/renovatebot/renovate/pull/36005 |
Yeah, it's branches in ?? conditional, very annoying, but usually could be fixed by providing data for the rightmost value in expression |
|
Thanks. 661d18d fixes the missing branch coverage I believe. |
| @@ -112,6 +112,9 @@ export class CrateDatasource extends Datasource { | |||
| const release: Release = { | |||
| version: version.vers.replace(/\+.*$/, ''), | |||
| }; | |||
| if (release.version !== version.vers) { | |||
| release.versionOrig = version.vers; | |||
There was a problem hiding this comment.
@rarkins I think it should be stored in a property like the managerData instead because this field can be overwritten by a user extract config 🤔
Changes
Add a default
extractVersionfor cargo manager to remove build metadata,instead of manual stripp inside
CrateDatasource.getReleases.This is just a proof of concept showing what I found. And sorry I didn't open a discussion first 😞. Feel free to close it.
Context
rust-lang/cargo#15557 (comment)
0.4.80+curl-8.12.1.postprocessReleaseuse the stripped version, which cannot be found because original exact version string is required, such ashttps://crates.io/crates/curl-sys/0.4.80+curl-8.12.1.Documentation (please check one with an [x])
extractVersionis added?How I've tested my work (please select one)
I have verified these changes via: