codingworkshop/act
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make envs available in if conditionals (#225)

Browse Source 
* Ignore .idea

* Add Env to the RunContext vm so we can Evaluate and Interpolate `env.xx`

* Make EvalBool support expressions more in line with the github runner

* Turns out Boolean(value) is what github is doing after all

* Add test for github context as well
This commit is contained in:
Torbjørn Vatn
2020-05-04 21:18:13 +02:00
committed by GitHub
parent 6d6ea7ac04
commit a149cf8ca2
5 changed files with 155 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/runner/run_context.go
View File

@@ -235,15 +235,15 @@ func (rc *RunContext) platformImage() string {
func (rc *RunContext) isEnabled(ctx context.Context) bool {
job := rc.Run.Job()
log := common.Logger(ctx)
l := common.Logger(ctx)
if !rc.EvalBool(job.If) {
log.Debugf("Skipping job '%s' due to '%s'", job.Name, job.If)
l.Debugf("Skipping job '%s' due to '%s'", job.Name, job.If)
return false
}
img := rc.platformImage()
if img == "" {
log.Infof("\U0001F6A7 Skipping unsupported platform '%+v'", job.RunsOn())
l.Infof("\U0001F6A7 Skipping unsupported platform '%+v'", job.RunsOn())
return false
}
return true
@@ -252,11 +252,9 @@ func (rc *RunContext) isEnabled(ctx context.Context) bool {
// EvalBool evaluates an expression against current run context
func (rc *RunContext) EvalBool(expr string) bool {
if expr != "" {
//v, err := rc.ExprEval.Evaluate(fmt.Sprintf("if (%s) { true } else { false }", expr))
expr := fmt.Sprintf("Boolean(%s)", expr)
expr = fmt.Sprintf("Boolean(%s)", rc.ExprEval.Interpolate(expr))
v, err := rc.ExprEval.Evaluate(expr)
if err != nil {
log.Errorf("Error evaluating expression '%s' - %v", expr, err)
return false
}
log.Debugf("expression '%s' evaluated to '%s'", expr, v)
@@ -386,9 +384,11 @@ func (rc *RunContext) getGithubContext() *githubContext {
log.Debugf("using github ref: %s", ref)
ghc.Ref = ref
}
err = json.Unmarshal([]byte(rc.EventJSON), &ghc.Event)
if err != nil {
logrus.Error(err)
if rc.EventJSON != "" {
err = json.Unmarshal([]byte(rc.EventJSON), &ghc.Event)
if err != nil {
logrus.Errorf("Unable to Unmarshal event '%s': %v", rc.EventJSON, err)
}
}
if ghc.EventName == "pull_request" {