Make local backend work with cli exec

cli/exec/exec.go

@@ -111,6 +111,13 @@
 		return err
 	}
 
+	// if we use the local backend we should signal to run at $repoPath
+	if c.String("backend-engine") == "local" && !c.IsSet("backend-local-exec-dir") {
+		if err := c.Set("backend-local-exec-dir", repoPath); err != nil {
+			return err
+		}
+	}
+
 	axes, err := matrix.ParseString(string(dat))
 	if err != nil {
 		return fmt.Errorf("parse matrix fail")

docs/docs/30-administration/22-backends/20-local.md

@@ -65,3 +65,11 @@ In the context of the local backend, plugins are simply executable binaries, whi
 > Default: default temp directory
 
 Directory to create folders for workflows.
+
+#### `WOODPECKER_BACKEND_LOCAL_EXEC_DIR`
+
+> Default: _empty_
+
+:::warning
+Only set it if you know why
+:::

pipeline/backend/local/flags.go

@@ -24,7 +24,12 @@ var Flags = []cli.Flag{
 	&cli.StringFlag{
 		Name:    "backend-local-temp-dir",
 		Sources: cli.EnvVars("WOODPECKER_BACKEND_LOCAL_TEMP_DIR"),
-		Usage:   "set a different temp dir to clone workflows into",
+		Usage:   "Set a different temp dir to clone workflows into.",
 		Value:   os.TempDir(),
 	},
+	&cli.StringFlag{
+		Name:    "backend-local-exec-dir",
+		Sources: cli.EnvVars("WOODPECKER_BACKEND_LOCAL_EXEC_DIR"),
+		Usage:   "Instead of using an tmp dir, we use this directory to exec the workflow in (mostly used by 'woodpecker-cli exec ...').",
+	},
 }

pipeline/backend/local/local.go

@@ -44,6 +44,7 @@
 
 type local struct {
 	tempDir         string
+	execDir         string
 	workflows       sync.Map
 	output          io.ReadCloser
 	pluginGitBinary string
@@ -80,6 +81,7 @@
 	c, ok := ctx.Value(types.CliCommand).(*cli.Command)
 	if ok {
 		e.tempDir = c.String("backend-local-temp-dir")
+		e.execDir = c.String("backend-local-exec-dir")
 	}
 
 	e.loadClone()
@@ -99,18 +101,33 @@
 	}
 
 	state := &workflowState{
-		stepCMDs:     make(map[string]*exec.Cmd),
-		baseDir:      baseDir,
-		workspaceDir: filepath.Join(baseDir, "workspace"),
-		homeDir:      filepath.Join(baseDir, "home"),
+		stepCMDs: make(map[string]*exec.Cmd),
+		baseDir:  baseDir,
+		homeDir:  filepath.Join(baseDir, "home"),
 	}
+	e.saveState(taskUUID, state)
 
 	if err := os.Mkdir(state.homeDir, 0o700); err != nil {
 		return err
 	}
 
-	if err := os.Mkdir(state.workspaceDir, 0o700); err != nil {
-		return err
+	if e.execDir == "" {
+		state.workspaceDir = filepath.Join(baseDir, "workspace")
+		if err := os.Mkdir(state.workspaceDir, 0o700); err != nil {
+			return err
+		}
+	} else {
+		state.workspaceDir = e.execDir
+		if stat, err := os.Stat(e.execDir); os.IsNotExist(err) {
+			log.Debug().Msgf("create workspace directory set by WOODPECKER_BACKEND_LOCAL_EXEC_DIR")
+			if err := os.Mkdir(state.workspaceDir, 0o700); err != nil {
+				return err
+			}
+		} else if !stat.IsDir() {
+			err := fmt.Errorf("backend option 'WOODPECKER_BACKEND_LOCAL_EXEC_DIR' was set to an existing file")
+			log.Error().Err(err).Msg("")
+			return err
+		}
 	}
 
 	e.saveState(taskUUID, state)