oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-09-15 18:57:01 +00:00
Code Wiki Activity

Revert "[RDNF #21 updated] fix: make node tool non volatile (#2372) + added 'time import' (#168)"

Browse source 
This reverts commit 6e1377c2b0.

Refs https://code.forgejo.org/forgejo/act/pulls/168/files#issuecomment-45317
This commit is contained in:
Earl Warren 2025-07-06 22:27:04 +02:00
parent 6e1377c2b0
commit 1a5cda1a93
9 changed files with 24 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

15
act/runner/action.go
View file

@ -183,7 +183,8 @@ func runActionImpl(step actionStep, actionDir string, remoteAction *remoteAction
if err := maybeCopyToActionDir(ctx, step, actionDir, actionPath, containerActionDir); err != nil {
return err
}
containerArgs := []string{rc.GetNodeToolFullPath(ctx), path.Join(containerActionDir, action.Runs.Main)}
containerArgs := []string{"node", path.Join(containerActionDir, action.Runs.Main)}
logger.Debugf("executing remote job container: %s", containerArgs)
rc.ApplyExtraPath(ctx, step.getEnv())
@ -568,7 +569,14 @@ func runPreStep(step actionStep) common.Executor {
return err
}
containerArgs := []string{rc.GetNodeToolFullPath(ctx), path.Join(containerActionDir, action.Runs.Pre)}
var containerArgs []string
if action.Runs.Using == model.ActionRunsUsingSh {
rc.ActionPath = containerActionDir
containerArgs = []string{"sh", "-c", action.Runs.Pre}
} else {
containerArgs = []string{"node", path.Join(containerActionDir, action.Runs.Pre)}
}
logger.Debugf("executing remote job container: %s", containerArgs)
rc.ApplyExtraPath(ctx, step.getEnv())
@ -699,9 +707,8 @@ func runPostStep(step actionStep) common.Executor {
case model.ActionRunsUsingNode12, model.ActionRunsUsingNode16, model.ActionRunsUsingNode20:
populateEnvsFromSavedState(step.getEnv(), step, rc)
populateEnvsFromInput(ctx, step.getEnv(), step.getActionModel(), rc)
containerArgs := []string{rc.GetNodeToolFullPath(ctx), path.Join(containerActionDir, action.Runs.Post)}
containerArgs := []string{"node", path.Join(containerActionDir, action.Runs.Post)}
logger.Debugf("executing remote job container: %s", containerArgs)
rc.ApplyExtraPath(ctx, step.getEnv())

21
act/runner/action_composite.go
View file

@ -64,17 +64,16 @@ func newCompositeRunContext(ctx context.Context, parent *RunContext, step action
},
},
},
Config: &configCopy,
StepResults: map[string]*model.StepResult{},
JobContainer: parent.JobContainer,
ActionPath: actionPath,
Env: env,
GlobalEnv: parent.GlobalEnv,
Masks: parent.Masks,
ExtraPath: parent.ExtraPath,
Parent: parent,
EventJSON: parent.EventJSON,
nodeToolFullPath: parent.nodeToolFullPath,
Config: &configCopy,
StepResults: map[string]*model.StepResult{},
JobContainer: parent.JobContainer,
ActionPath: actionPath,
Env: env,
GlobalEnv: parent.GlobalEnv,
Masks: parent.Masks,
ExtraPath: parent.ExtraPath,
Parent: parent,
EventJSON: parent.EventJSON,
}
compositerc.ExprEval = compositerc.NewExpressionEvaluator(ctx)

2
act/runner/action_test.go
View file

@ -164,7 +164,6 @@ func TestActionRunner(t *testing.T) {
},
},
},
nodeToolFullPath: "node",
},
action: &model.Action{
Inputs: map[string]model.Input{
@ -209,7 +208,6 @@ func TestActionRunner(t *testing.T) {
"name": "state value",
},
},
nodeToolFullPath: "node",
},
action: &model.Action{
Runs: model.ActionRuns{

2
act/runner/expression.go
View file

@ -196,7 +196,7 @@ func getHashFilesFunction(ctx context.Context, rc *RunContext) func(v []reflect.
Mode: 0o644,
Body: hashfiles,
}).
Then(rc.execJobContainer([]string{rc.GetNodeToolFullPath(ctx), path.Join(rc.JobContainer.GetActPath(), name)},
Then(rc.execJobContainer([]string{"node", path.Join(rc.JobContainer.GetActPath(), name)},
env, "", "")).
Finally(func(context.Context) error {
rc.JobContainer.ReplaceLogWriter(stdout, stderr)

1
act/runner/job_executor.go
View file

@ -141,7 +141,6 @@ func newJobExecutor(info jobInfo, sf stepFactory, rc *RunContext) common.Executo
})
pipeline := make([]common.Executor, 0)
pipeline = append(pipeline, rc.InitializeNodeTool())
pipeline = append(pipeline, preSteps...)
pipeline = append(pipeline, steps...)

3
act/runner/job_executor_test.go
View file

@ -257,8 +257,7 @@ func TestNewJobExecutor(t *testing.T) {
},
},
},
Config: &Config{},
nodeToolFullPath: "node",
Config: &Config{},
}
rc.ExprEval = rc.NewExpressionEvaluator(ctx)
executorOrder := make([]string, 0)

44
act/runner/run_context.go
View file

@ -19,7 +19,6 @@ import (
"runtime"
"strings"
"text/template"
"time"
"github.com/docker/docker/api/types/network"
"github.com/docker/go-connections/nat"
@ -53,7 +52,6 @@ type RunContext struct {
Masks []string
cleanUpJobContainer common.Executor
caller *caller // job calling this RunContext (reusable workflows)
nodeToolFullPath string
}
func (rc *RunContext) AddMask(mask string) {
@ -594,48 +592,6 @@ func (rc *RunContext) execJobContainer(cmd []string, env map[string]string, user
}
}
func (rc *RunContext) InitializeNodeTool() common.Executor {
return func(ctx context.Context) error {
rc.GetNodeToolFullPath(ctx)
return nil
}
}
func (rc *RunContext) GetNodeToolFullPath(ctx context.Context) string {
if rc.nodeToolFullPath == "" {
timeed, cancel := context.WithTimeout(ctx, time.Minute)
defer cancel()
path := rc.JobContainer.GetPathVariableName()
cenv := map[string]string{}
var cpath string
if err := rc.JobContainer.UpdateFromImageEnv(&cenv)(ctx); err == nil {
if p, ok := cenv[path]; ok {
cpath = p
}
}
if len(cpath) == 0 {
cpath = rc.JobContainer.DefaultPathVariable()
}
cenv[path] = cpath
hout := &bytes.Buffer{}
herr := &bytes.Buffer{}
stdout, stderr := rc.JobContainer.ReplaceLogWriter(hout, herr)
err := rc.execJobContainer([]string{"node", "--no-warnings", "-e", "console.log(process.execPath)"},
cenv, "", "").
Finally(func(context.Context) error {
rc.JobContainer.ReplaceLogWriter(stdout, stderr)
return nil
})(timeed)
rawStr := strings.Trim(hout.String(), "\r\n")
if err == nil && !strings.ContainsAny(rawStr, "\r\n") {
rc.nodeToolFullPath = rawStr
} else {
rc.nodeToolFullPath = "node"
}
}
return rc.nodeToolFullPath
}
func (rc *RunContext) ApplyExtraPath(ctx context.Context, env *map[string]string) {
if len(rc.ExtraPath) > 0 {
path := rc.JobContainer.GetPathVariableName()

3
act/runner/step_action_local_test.go
View file

@ -249,8 +249,7 @@ func TestStepActionLocalPost(t *testing.T) {
},
},
},
StepResults: tt.initialStepResults,
nodeToolFullPath: "node",
StepResults: tt.initialStepResults,
},
Step: tt.stepModel,
action: tt.actionModel,

1
act/runner/step_action_remote_test.go
View file

@ -573,7 +573,6 @@ func TestStepActionRemotePost(t *testing.T) {
},
StepResults: tt.initialStepResults,
IntraActionState: tt.IntraActionState,
nodeToolFullPath: "node",
},
Step: tt.stepModel,
action: tt.actionModel,