Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ class GitServiceImpl(
} else if (statusOutput.output.isBlank()) {
log.info("Нет изменений для коммита в ветке $newBranch")
// Обновляем статус коммита как завершенного, даже если нет изменений
commitInfo.urlBranch = "${commitInfo.project!!.urlRepo}/tree/$newBranch"
commitInfo.urlBranch = "${commitInfo.project!!.urlRepo}/src/branch/$newBranch"
commitInfo.setStatus(StatusSheduler.COMPLETE)
dataManager.save(commitInfo)
return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ class OneRunner(private val dataManager: DataManager
}
// Формат времени для имени лог-файла
val timeStamp = SimpleDateFormat("yyyy-MM-dd_HH-mm-ss").format(Date())
val logFileName = "OneLog${File.separator}out_$timeStamp.log"
val logFileName = ".${File.separator}OneLog${File.separator}out_$timeStamp.log"

val res = shellExecutor.executeCommand(listOf(
pathPlatform(pathInstall, version),
"DESIGNER",
"/DisableStartupDialogs",
"/DumpExternalDataProcessorOrReportToFiles",
"\"${targetDir.path}\"",
"\"${targetDir.path}${File.separator}\"",
"\"${inputFile.path}\"",
"/Out",
logFileName
Expand Down
Loading