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

feat: support actions with 'using: node24'

Browse source 
It's worth noting that runner does not actually invoke different
versions of node depending on the `using` tag -- it just defers to the
`node` command in the path regardless of the tagged value.  But this
change allows `node24` to be provided and run node, the same level of
support as node12...node20.
This commit is contained in:
Mathieu Fenniak 2025-08-11 09:34:42 -06:00
parent e5603fe6d9
commit 7ff3f7da0f
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
act/model/action.go
View file

@ -21,7 +21,7 @@ func (a *ActionRunsUsing) UnmarshalYAML(unmarshal func(interface{}) error) error
// Force input to lowercase for case insensitive comparison // Force input to lowercase for case insensitive comparison
format := ActionRunsUsing(strings.ToLower(using)) format := ActionRunsUsing(strings.ToLower(using))
switch format { switch format {
case ActionRunsUsingNode20, ActionRunsUsingNode16, ActionRunsUsingNode12, ActionRunsUsingDocker, ActionRunsUsingComposite, ActionRunsUsingGo, ActionRunsUsingSh: case ActionRunsUsingNode24, ActionRunsUsingNode20, ActionRunsUsingNode16, ActionRunsUsingNode12, ActionRunsUsingDocker, ActionRunsUsingComposite, ActionRunsUsingGo, ActionRunsUsingSh:
*a = format *a = format
default: default:
return fmt.Errorf("The runs.using key in action.yml must be one of: %v, got %s", []string{ return fmt.Errorf("The runs.using key in action.yml must be one of: %v, got %s", []string{
@ -30,6 +30,7 @@ func (a *ActionRunsUsing) UnmarshalYAML(unmarshal func(interface{}) error) error
ActionRunsUsingNode12, ActionRunsUsingNode12,
ActionRunsUsingNode16, ActionRunsUsingNode16,
ActionRunsUsingNode20, ActionRunsUsingNode20,
ActionRunsUsingNode24,
ActionRunsUsingGo, ActionRunsUsingGo,
ActionRunsUsingSh, ActionRunsUsingSh,
}, format) }, format)
@ -44,6 +45,8 @@ const (
ActionRunsUsingNode16 = "node16" ActionRunsUsingNode16 = "node16"
// ActionRunsUsingNode20 for running with node20 // ActionRunsUsingNode20 for running with node20
ActionRunsUsingNode20 = "node20" ActionRunsUsingNode20 = "node20"
// ActionRunsUsingNode24 for running with node24
ActionRunsUsingNode24 = "node24"
// ActionRunsUsingDocker for running with docker // ActionRunsUsingDocker for running with docker
ActionRunsUsingDocker = "docker" ActionRunsUsingDocker = "docker"
// ActionRunsUsingComposite for running composite // ActionRunsUsingComposite for running composite

9
act/runner/action.go
View file

@ -182,7 +182,7 @@ func runActionImpl(step actionStep, actionDir string, remoteAction *remoteAction
logger.Debugf("type=%v actionDir=%s actionPath=%s workdir=%s actionCacheDir=%s actionName=%s containerActionDir=%s", stepModel.Type(), actionDir, actionPath, rc.Config.Workdir, rc.ActionCacheDir(), actionName, containerActionDir) logger.Debugf("type=%v actionDir=%s actionPath=%s workdir=%s actionCacheDir=%s actionName=%s containerActionDir=%s", stepModel.Type(), actionDir, actionPath, rc.Config.Workdir, rc.ActionCacheDir(), actionName, containerActionDir)
switch action.Runs.Using { switch action.Runs.Using {
case model.ActionRunsUsingNode12, model.ActionRunsUsingNode16, model.ActionRunsUsingNode20: case model.ActionRunsUsingNode12, model.ActionRunsUsingNode16, model.ActionRunsUsingNode20, model.ActionRunsUsingNode24:
if err := maybeCopyToActionDir(ctx, step, actionDir, actionPath, containerActionDir); err != nil { if err := maybeCopyToActionDir(ctx, step, actionDir, actionPath, containerActionDir); err != nil {
return err return err
} }
@ -237,6 +237,7 @@ func runActionImpl(step actionStep, actionDir string, remoteAction *remoteAction
model.ActionRunsUsingNode12, model.ActionRunsUsingNode12,
model.ActionRunsUsingNode16, model.ActionRunsUsingNode16,
model.ActionRunsUsingNode20, model.ActionRunsUsingNode20,
model.ActionRunsUsingNode24,
model.ActionRunsUsingComposite, model.ActionRunsUsingComposite,
model.ActionRunsUsingGo, model.ActionRunsUsingGo,
model.ActionRunsUsingSh, model.ActionRunsUsingSh,
@ -530,6 +531,7 @@ func hasPreStep(step actionStep) common.Conditional {
((action.Runs.Using == model.ActionRunsUsingNode12 || ((action.Runs.Using == model.ActionRunsUsingNode12 ||
action.Runs.Using == model.ActionRunsUsingNode16 || action.Runs.Using == model.ActionRunsUsingNode16 ||
action.Runs.Using == model.ActionRunsUsingNode20 || action.Runs.Using == model.ActionRunsUsingNode20 ||
action.Runs.Using == model.ActionRunsUsingNode24 ||
action.Runs.Using == model.ActionRunsUsingGo || action.Runs.Using == model.ActionRunsUsingGo ||
action.Runs.Using == model.ActionRunsUsingSh) && action.Runs.Using == model.ActionRunsUsingSh) &&
action.Runs.Pre != "") action.Runs.Pre != "")
@ -546,7 +548,7 @@ func runPreStep(step actionStep) common.Executor {
action := step.getActionModel() action := step.getActionModel()
switch action.Runs.Using { switch action.Runs.Using {
case model.ActionRunsUsingNode12, model.ActionRunsUsingNode16, model.ActionRunsUsingNode20, model.ActionRunsUsingSh: case model.ActionRunsUsingNode12, model.ActionRunsUsingNode16, model.ActionRunsUsingNode20, model.ActionRunsUsingNode24, model.ActionRunsUsingSh:
// defaults in pre steps were missing, however provided inputs are available // defaults in pre steps were missing, however provided inputs are available
populateEnvsFromInput(ctx, step.getEnv(), action, rc) populateEnvsFromInput(ctx, step.getEnv(), action, rc)
// todo: refactor into step // todo: refactor into step
@ -672,6 +674,7 @@ func hasPostStep(step actionStep) common.Conditional {
((action.Runs.Using == model.ActionRunsUsingNode12 || ((action.Runs.Using == model.ActionRunsUsingNode12 ||
action.Runs.Using == model.ActionRunsUsingNode16 || action.Runs.Using == model.ActionRunsUsingNode16 ||
action.Runs.Using == model.ActionRunsUsingNode20 || action.Runs.Using == model.ActionRunsUsingNode20 ||
action.Runs.Using == model.ActionRunsUsingNode24 ||
action.Runs.Using == model.ActionRunsUsingGo || action.Runs.Using == model.ActionRunsUsingGo ||
action.Runs.Using == model.ActionRunsUsingSh) && action.Runs.Using == model.ActionRunsUsingSh) &&
action.Runs.Post != "") action.Runs.Post != "")
@ -708,7 +711,7 @@ func runPostStep(step actionStep) common.Executor {
_, containerActionDir := getContainerActionPaths(stepModel, actionLocation, rc) _, containerActionDir := getContainerActionPaths(stepModel, actionLocation, rc)
switch action.Runs.Using { switch action.Runs.Using {
case model.ActionRunsUsingNode12, model.ActionRunsUsingNode16, model.ActionRunsUsingNode20: case model.ActionRunsUsingNode12, model.ActionRunsUsingNode16, model.ActionRunsUsingNode20, model.ActionRunsUsingNode24:
populateEnvsFromSavedState(step.getEnv(), step, rc) populateEnvsFromSavedState(step.getEnv(), step, rc)
populateEnvsFromInput(ctx, step.getEnv(), step.getActionModel(), rc) populateEnvsFromInput(ctx, step.getEnv(), step.getActionModel(), rc)