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

This reverts commit 6e1377c2b0.

Refs https://code.forgejo.org/forgejo/act/pulls/168/files#issuecomment-45317

act/runner/action.go

@@ -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())

act/runner/action_composite.go

@@ -74,7 +74,6 @@ func newCompositeRunContext(ctx context.Context, parent *RunContext, step action
 		ExtraPath:    parent.ExtraPath,
 		Parent:       parent,
 		EventJSON:    parent.EventJSON,
-		nodeToolFullPath: parent.nodeToolFullPath,
 	}
 	compositerc.ExprEval = compositerc.NewExpressionEvaluator(ctx)
 

act/runner/action_test.go

@@ -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{

act/runner/expression.go

@@ -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)

act/runner/job_executor.go

@@ -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...)
 

act/runner/job_executor_test.go

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

act/runner/run_context.go

@@ -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()

act/runner/step_action_local_test.go

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

act/runner/step_action_remote_test.go

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