Skip to content

Commit

Permalink
Merge branch 'main' into fix_routed_override_test
Browse files Browse the repository at this point in the history
  • Loading branch information
stuggi authored Aug 8, 2024
2 parents 0248805 + ac8a151 commit 456ee4e
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions modules/test/crd.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func GetCRDDirFromModule(moduleName string, goModPath string, relativeCRDPath st
path = filepath.Join(build.Default.GOPATH, "pkg", "mod", versionedModule, relativeCRDPath)
}

if runtime.GOOS != "Darwin" {
if runtime.GOOS != "darwin" {
path, err = encodePath(path)
if err != nil {
return path, err
Expand All @@ -147,9 +147,12 @@ func GetOpenShiftCRDDir(crdName string, goModPath string) (string, error) {
}
versionedModule := fmt.Sprintf("%s@%s", libCommon, version)
path := filepath.Join(build.Default.GOPATH, "pkg", "mod", versionedModule, "openshift_crds", crdName)
path, err = encodePath(path)
if err != nil {
return path, err

if runtime.GOOS != "darwin" {
path, err = encodePath(path)
if err != nil {
return path, err
}
}

return path, nil
Expand Down

0 comments on commit 456ee4e

Please sign in to comment.