-
Notifications
You must be signed in to change notification settings - Fork 7
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
Add support for Windows artifacts from Brew #743
base: master
Are you sure you want to change the base?
Conversation
c377cc3
to
87ccc26
Compare
ArtifactBuilder<?, ?> builder; | ||
|
||
switch (buildType) { | ||
case GRADLE, MAVEN, SBT -> builder = createMavenArtifact(archiveInfo); | ||
case NPM -> builder = createNpmArtifact(archiveInfo); | ||
case maven -> builder = createMavenArtifact(archiveInfo); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what happened to the GRADLE and SBT type?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am adding a new Windows (WIN
) build type to DelAn that already exists in kojiji in order to allow DelAn to scan zips that were created on a Windows host.
There never was a "gradle" or "sbt" type in Koji. This was a string field that was being "abused" in DelAn. I am changing the type to an enum in Kojiji to prevent this. See this PR release-engineering/kojiji#167.
Ultimately, I don't think that this PR changes anything in DelAn since it always called createMavenArtifact
for the "gradle" or "sbt" types. The extra information will still be available somewhere else, but not in this field.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I see you are mapping it in buildfinder here https://github.com/project-ncl/build-finder/pull/1294/files#diff-f70b10b14f82c099497e76bf8a9bd558a1bb123b3390727f5a9c2ccf7a7057e1R309
Ok
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is made up of the two PRs above, plus project-ncl/pnc-api#244. The kojiji and pnc-api PRs need to go in first.
The current mapping from PNC to Brew is now if NPM then NPM else MAVEN
.
Brew supports WIN
, IMAGE
and RPM
types which aren't supported by PNC. The "gradle" and "sbt" types were PNC types not supported by Brew.
I am adding the WIN
type to PNC (DelAn only). I don't see how the IMAGE
type is useful, and the RPM
type is the default type, and I am not sure that we scan RPMs directly with DelAn (although it's possible to do).
There is a lot of unnecessary unreleated code style changes. If you really want them, put them at least to different commit. |
Yes, I prefer to change to Java 17 style code now. Sure, I will split it into a separate PR. |
87ccc26
to
839c2e4
Compare
497463f
to
d9637fa
Compare
d9637fa
to
bac653e
Compare
No description provided.