mirror of
https://gitea.com/gitea/act_runner.git
synced 2026-03-22 06:45:03 +01:00
Platform tart:// improve logging / fix tool_cache (#61)
This commit is contained in:
@@ -64,7 +64,7 @@ func (rc *RunContext) startTartEnvironment() common.Executor {
|
||||
SSHPassword: "admin",
|
||||
Softnet: query.Get("softnet") == "1",
|
||||
Headless: query.Get("headless") != "0",
|
||||
AlwaysPull: query.Get("pull") != "0",
|
||||
AlwaysPull: rc.Config.ForcePull,
|
||||
},
|
||||
Env: &tart.Env{
|
||||
JobImage: platURI.Host + platURI.EscapedPath(),
|
||||
@@ -72,6 +72,9 @@ func (rc *RunContext) startTartEnvironment() common.Executor {
|
||||
},
|
||||
Miscpath: miscpath,
|
||||
}
|
||||
if query.Has("pull") {
|
||||
tenv.Config.AlwaysPull = query.Get("pull") != "0"
|
||||
}
|
||||
rc.JobContainer = tenv
|
||||
if query.Has("sshusername") {
|
||||
tenv.Config.SSHUsername = query.Get("sshusername")
|
||||
@@ -85,14 +88,6 @@ func (rc *RunContext) startTartEnvironment() common.Executor {
|
||||
rc.Env[fmt.Sprintf("RUNNER_%s", strings.ToUpper(k))] = v
|
||||
}
|
||||
}
|
||||
// for _, env := range os.Environ() {
|
||||
// if k, v, ok := strings.Cut(env, "="); ok {
|
||||
// // don't override
|
||||
// if _, ok := rc.Env[k]; !ok {
|
||||
// rc.Env[k] = v
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
return common.NewPipelineExecutor(
|
||||
// rc.JobContainer.Remove(),
|
||||
|
||||
Reference in New Issue
Block a user