Support csproj files for identifying .NET Core projects#11896
Support csproj files for identifying .NET Core projects#11896openshift-bot merged 1 commit intoopenshift:masterfrom
Conversation
|
|
||
| // DetectLiteralDotNet detects .NET source and matches it to a .net supported annotation | ||
| func DetectLiteralDotNet(dir string) (*Info, bool) { | ||
| return detect(".net", dir, "project.json") |
There was a problem hiding this comment.
this matches to imagestreams with a "supports" annotation with value of ".net"
| return true | ||
| func detectGlob(platform string, dir string, globs ...string) *Info { | ||
| for _, g := range globs { | ||
| if matches, _ := filepath.Glob(filepath.Join(dir, g)); len(matches) > 0 { |
There was a problem hiding this comment.
can we not just do globbing in the existing detect function, regardless of whether the passed pattern contains a * ?
jim-minter
force-pushed
the
issue11842
branch
from
b8731b7 to
90d47d2
Compare
|
All changes made, thanks. |
pkg/generate/source/detector.go
Outdated
| return detect("scala", dir, "build.sbt") | ||
| } | ||
|
|
||
| // DetectDotNet detects .NET source and matches it to a dotnet supported annotatin or dotnet imagestream name |
There was a problem hiding this comment.
annotation (i know, not your fault but it's bugging me now :) )
jim-minter
force-pushed
the
issue11842
branch
from
90d47d2 to
b865d3c
Compare
|
Done. |
|
lgtm for post 3.4 merge. |
|
[merge] |
|
[Test]ing while waiting on the merge queue |
|
jim-minter
force-pushed
the
issue11842
branch
from
b865d3c to
4c3626f
Compare
jim-minter
force-pushed
the
issue11842
branch
from
4c3626f to
7cc7460
Compare
|
Evaluated for origin test up to 7cc7460 |
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/11593/) (Base Commit: 3b2bbe5) |
|
[merge] |
|
Evaluated for origin merge up to 7cc7460 |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/11603/) (Base Commit: 57f69c1) (Image: devenv-rhel7_5393) |
3 participants
Fixes #11842
@bparees ptal - I removed DetectLiteralDotNet() because I couldn't see how it could possibly be triggered?