Skip to content
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

[Playground] Fix graph.dot search path #26951

Merged
merged 1 commit into from
Jun 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion playground/backend/internal/fs_tool/fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ type LifeCyclePaths struct {
AbsoluteExecutableFilePath string // /path/to/workingDir/pipelinesFolder/{pipelineId}/bin/{pipelineId}.{executableFileExtension}
AbsoluteBaseFolderPath string // /path/to/workingDir/pipelinesFolder/{pipelineId}
AbsoluteLogFilePath string // /path/to/workingDir/pipelinesFolder/{pipelineId}/logs.log
AbsoluteGraphFilePath string // /path/to/workingDir/pipelinesFolder/{pipelineId}/graph.dot
AbsoluteGraphFilePath string // /path/to/workingDir/pipelinesFolder/{pipelineId}/src/graph.dot
ProjectDir string // /path/to/workingDir/
FindExecutableName func(context.Context, string) (string, error)
FindTestExecutableName func(context.Context, string) (string, error)
Expand Down
4 changes: 2 additions & 2 deletions playground/backend/internal/fs_tool/fs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ func TestNewLifeCycle(t *testing.T) {
AbsoluteExecutableFilePath: filepath.Join(execFileFolder, fmt.Sprintf("%s%s", pipelineId.String(), javaCompiledFileExtension)),
AbsoluteBaseFolderPath: baseFileFolder,
AbsoluteLogFilePath: filepath.Join(baseFileFolder, logFileName),
AbsoluteGraphFilePath: filepath.Join(baseFileFolder, utils.GraphFileName),
AbsoluteGraphFilePath: filepath.Join(srcFileFolder, utils.GraphFileName),
},
},
},
Expand All @@ -335,7 +335,7 @@ func TestNewLifeCycle(t *testing.T) {
AbsoluteExecutableFilePath: filepath.Join(execFileFolder, fmt.Sprintf("%s%s", pipelineId.String(), goExecutableFileExtension)),
AbsoluteBaseFolderPath: baseFileFolder,
AbsoluteLogFilePath: filepath.Join(baseFileFolder, logFileName),
AbsoluteGraphFilePath: filepath.Join(baseFileFolder, utils.GraphFileName),
AbsoluteGraphFilePath: filepath.Join(srcFileFolder, utils.GraphFileName),
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/internal/fs_tool/go_fs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func Test_newGoLifeCycle(t *testing.T) {
AbsoluteExecutableFilePath: filepath.Join(binFileFolder, pipelineId.String()+goExecutableFileExtension),
AbsoluteBaseFolderPath: baseFileFolder,
AbsoluteLogFilePath: filepath.Join(baseFileFolder, logFileName),
AbsoluteGraphFilePath: filepath.Join(baseFileFolder, utils.GraphFileName),
AbsoluteGraphFilePath: filepath.Join(srcFileFolder, utils.GraphFileName),
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/internal/fs_tool/lc_constructor.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func newCompilingLifeCycle(pipelineId uuid.UUID, pipelinesFolder, sourceFileExte
absExecFilePath, _ := filepath.Abs(filepath.Join(absExecFileFolderPath, execFileName))
absBaseFolderPath, _ := filepath.Abs(baseFileFolder)
absLogFilePath, _ := filepath.Abs(filepath.Join(absBaseFolderPath, logFileName))
absGraphFilePath, _ := filepath.Abs(filepath.Join(absBaseFolderPath, utils.GraphFileName))
absGraphFilePath, _ := filepath.Abs(filepath.Join(absSrcFileFolderPath, utils.GraphFileName))

return &LifeCycle{
folderGlobs: []string{baseFileFolder, srcFileFolder, binFileFolder},
Expand Down