yume/act
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support configuration variables (#43)

Browse source 
related to: https://gitea.com/gitea/act_runner/issues/127

This PR make `act` support the expression like `${{ vars.YOUR_CUSTOM_VARIABLES }}`.

Reviewed-on: https://gitea.com/gitea/act/pulls/43
Reviewed-by: Jason Song <i@wolfogre.com>
Co-authored-by: sillyguodong <gedong_1994@163.com>
Co-committed-by: sillyguodong <gedong_1994@163.com>
This commit is contained in:
sillyguodong 2023-04-19 15:22:56 +08:00 committed by Jason Song
parent d3a56cdb69
commit de529139af
5 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/exprparser/interpreter.go
View file

@ -23,6 +23,8 @@ type EvaluationEnvironment struct {
Matrix map[string]interface{} Matrix map[string]interface{}
Needs map[string]Needs Needs map[string]Needs
Inputs map[string]interface{} Inputs map[string]interface{}
Vars map[string]string
} }
type Needs struct { type Needs struct {
@ -181,6 +183,8 @@ func (impl *interperterImpl) evaluateVariable(variableNode *actionlint.VariableN
return math.Inf(1), nil return math.Inf(1), nil
case "nan": case "nan":
return math.NaN(), nil return math.NaN(), nil
case "vars":
return impl.env.Vars, nil
default: default:
return nil, fmt.Errorf("Unavailable context: %s", variableNode.Name) return nil, fmt.Errorf("Unavailable context: %s", variableNode.Name)
} }

2
pkg/jobparser/interpeter.go
View file

@ -62,6 +62,8 @@ func NewInterpeter(
Matrix: matrix, Matrix: matrix,
Needs: using, Needs: using,
Inputs: nil, // not supported yet Inputs: nil, // not supported yet
Vars: nil,
} }
config := exprparser.Config{ config := exprparser.Config{

4
pkg/runner/expression.go
View file

@ -81,6 +81,8 @@ func (rc *RunContext) NewExpressionEvaluatorWithEnv(ctx context.Context, env map
Matrix: rc.Matrix, Matrix: rc.Matrix,
Needs: using, Needs: using,
Inputs: inputs, Inputs: inputs,
Vars: rc.getVarsContext(),
} }
if rc.JobContainer != nil { if rc.JobContainer != nil {
ee.Runner = rc.JobContainer.GetRunnerContext(ctx) ee.Runner = rc.JobContainer.GetRunnerContext(ctx)
@ -130,6 +132,8 @@ func (rc *RunContext) NewStepExpressionEvaluator(ctx context.Context, step step)
// todo: should be unavailable // todo: should be unavailable
// but required to interpolate/evaluate the inputs in actions/composite // but required to interpolate/evaluate the inputs in actions/composite
Inputs: inputs, Inputs: inputs,
Vars: rc.getVarsContext(),
} }
if rc.JobContainer != nil { if rc.JobContainer != nil {
ee.Runner = rc.JobContainer.GetRunnerContext(ctx) ee.Runner = rc.JobContainer.GetRunnerContext(ctx)

4
pkg/runner/run_context.go
View file

@ -683,6 +683,10 @@ func (rc *RunContext) getStepsContext() map[string]*model.StepResult {
return rc.StepResults return rc.StepResults
} }
func (rc *RunContext) getVarsContext() map[string]string {
return rc.Config.Vars
}
func (rc *RunContext) getGithubContext(ctx context.Context) *model.GithubContext { func (rc *RunContext) getGithubContext(ctx context.Context) *model.GithubContext {
logger := common.Logger(ctx) logger := common.Logger(ctx)
ghc := &model.GithubContext{ ghc := &model.GithubContext{

1
pkg/runner/runner.go
View file

@ -64,6 +64,7 @@ type Config struct {
DefaultActionInstance string // the default actions web site DefaultActionInstance string // the default actions web site
PlatformPicker func(labels []string) string // platform picker, it will take precedence over Platforms if isn't nil PlatformPicker func(labels []string) string // platform picker, it will take precedence over Platforms if isn't nil
JobLoggerLevel *log.Level // the level of job logger JobLoggerLevel *log.Level // the level of job logger
Vars map[string]string // the list of variables set at the repository, environment, or organization levels.
} }
func (c Config) GetToken() string { func (c Config) GetToken() string {