Fix CI_WORKSPACE in local backend (#2627)

qwerty287 · web-flow · commit efbde332a371 · 2023-10-23T12:54:10.000+02:00
closes #2610
diff --git a/pipeline/backend/local/clone.go b/pipeline/backend/local/clone.go
@@ -84,8 +84,6 @@ func (e *local) execClone(ctx context.Context, step *types.Step, state *workflow
 		return err
 	}
 
-	env = append(env, "CI_WORKSPACE="+state.workspaceDir)
-
 	// Prepare command
 	var cmd *exec.Cmd
 	if rmCmd != "" {
diff --git a/pipeline/backend/local/const.go b/pipeline/backend/local/const.go
@@ -27,6 +27,7 @@ var notAllowedEnvVarOverwrites = []string{
 	"CI_SCRIPT",
 	"HOME",
 	"SHELL",
+	"CI_WORKSPACE",
 }
 
 var (
diff --git a/pipeline/backend/local/local.go b/pipeline/backend/local/local.go
@@ -112,9 +112,10 @@ func (e *local) StartStep(ctx context.Context, step *types.Step, taskUUID string
 		}
 	}
 
-	// Set HOME
+	// Set HOME and CI_WORKSPACE
 	env = append(env, "HOME="+state.homeDir)
 	env = append(env, "USERPROFILE="+state.homeDir)
+	env = append(env, "CI_WORKSPACE="+state.workspaceDir)
 
 	switch step.Type {
 	case types.StepTypeClone:

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,6 @@ func (e local) execClone(ctx context.Context, step types.Step, state *workflow`
`84`	`84`	`return err`
`85`	`85`	`}`
`86`	`86`
`87`		`- env = append(env, "CI_WORKSPACE="+state.workspaceDir)`
`88`		`-`
`89`	`87`	`// Prepare command`
`90`	`88`	`var cmd *exec.Cmd`
`91`	`89`	`if rmCmd != "" {`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ var notAllowedEnvVarOverwrites = []string{`
`27`	`27`	`"CI_SCRIPT",`
`28`	`28`	`"HOME",`
`29`	`29`	`"SHELL",`
	`30`	`+ "CI_WORKSPACE",`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,10 @@ func (e local) StartStep(ctx context.Context, step types.Step, taskUUID string`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`		`- // Set HOME`
	`115`	`+ // Set HOME and CI_WORKSPACE`
`116`	`116`	`env = append(env, "HOME="+state.homeDir)`
`117`	`117`	`env = append(env, "USERPROFILE="+state.homeDir)`
	`118`	`+ env = append(env, "CI_WORKSPACE="+state.workspaceDir)`
`118`	`119`
`119`	`120`	`switch step.Type {`
`120`	`121`	`case types.StepTypeClone:`