cybercyst/drone
1
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-05 23:42:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: [CDE-577]: fix jetbrains ide issues (#3281)

Browse Source 
* feat: [CDE-577]: fix jetbrains ide issues
This commit is contained in:
Deepak Bhatt 2025-01-16 07:23:26 +00:00 committed by Harness
parent c9d62fdc0e
commit c54b82706e
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/gitspace/orchestrator/container/embedded_docker_container_orchestrator.go
View File

@ -220,7 +220,10 @@ func (e *EmbeddedDockerOrchestrator) startStoppedGitspace(
} }
// Run IDE setup // Run IDE setup
if err = ideService.Run(ctx, exec, nil, logStreamInstance); err != nil { runIDEArgs := make(map[gitspaceTypes.IDEArg]interface{})
runIDEArgs[gitspaceTypes.IDERepoNameArg] = resolvedRepoDetails.RepoName
runIDEArgs = AddIDEDirNameArg(ideService, runIDEArgs)
if err = ideService.Run(ctx, exec, runIDEArgs, logStreamInstance); err != nil {
return err return err
} }

4
app/gitspace/orchestrator/ide/jetbrains.go
View File

@ -197,12 +197,12 @@ func (jb *JetBrainsIDE) Run(
return err return err
} }
gitspaceLogger.Info("Successfully run ssh-server") gitspaceLogger.Info("Successfully run ssh-server")
gitspaceLogger.Info("Run Remote IntelliJ IdeType...") gitspaceLogger.Info(fmt.Sprintf("Remote %s ide run output...", jb.ideType))
err = jb.runRemoteIDE(ctx, exec, args, gitspaceLogger) err = jb.runRemoteIDE(ctx, exec, args, gitspaceLogger)
if err != nil { if err != nil {
return err return err
} }
gitspaceLogger.Info("Successfully Run Remote IntelliJ IdeType") gitspaceLogger.Info(fmt.Sprintf("Successfully run %s ide", jb.ideType))
return nil return nil
} }

4
app/gitspace/orchestrator/utils/script_templates/run_jetbrains_ide.sh
View File

@ -41,8 +41,8 @@ is_ide_running(){
echo "waiting for ide to run..." echo "waiting for ide to run..."
if is_ide_running; then if is_ide_running; then
echo "intellij ide is running" echo "ide is running"
else else
echo "intellij ide is not running" echo "ide is not running"
exit 1 exit 1
fi fi

1
cli/operations/server/config.go
View File

@ -452,6 +452,7 @@ func ProvideIDEJetBrainsConfig(config *types.Config) *ide.JetBrainsIDEConfig {
PHPStormPort: config.IDE.PHPStorm.Port, PHPStormPort: config.IDE.PHPStorm.Port,
CLionPort: config.IDE.CLion.Port, CLionPort: config.IDE.CLion.Port,
RubyMinePort: config.IDE.RubyMine.Port, RubyMinePort: config.IDE.RubyMine.Port,
RiderPort: config.IDE.Rider.Port,
} }
} }

2
types/jetbrains.go
View File

@ -69,7 +69,7 @@ var JetBrainsIDEDownloadURLTemplateMap = map[enum.IDEType]JetBrainsIDEDownloadUR
}, },
enum.IDETypeRider: { enum.IDETypeRider: {
// list of versions: https://www.jetbrains.com/ruby/download/other.html // list of versions: https://www.jetbrains.com/ruby/download/other.html
Version: "2024.3.1.1", Version: "2024.3.3",
Amd64: "https://download.jetbrains.com/rider/JetBrains.Rider-%s.tar.gz", Amd64: "https://download.jetbrains.com/rider/JetBrains.Rider-%s.tar.gz",
Arm64: "https://download.jetbrains.com/rider/JetBrains.Rider-%s-aarch64.tar.gz", Arm64: "https://download.jetbrains.com/rider/JetBrains.Rider-%s-aarch64.tar.gz",
}, },