Make the external url of cache server configurable if necessary

pkg/jobparser/model.go

@@ -172,20 +172,10 @@ type RunDefaults struct {
 	WorkingDirectory string `yaml:"working-directory,omitempty"`
 }
 
-type WorkflowDispatchInput struct {
-	Name        string   `yaml:"name"`
-	Description string   `yaml:"description"`
-	Required    bool     `yaml:"required"`
-	Default     string   `yaml:"default"`
-	Type        string   `yaml:"type"`
-	Options     []string `yaml:"options"`
-}
-
 type Event struct {
 	Name      string
 	acts      map[string][]string
 	schedules []map[string]string
-	inputs    []WorkflowDispatchInput
 }
 
 func (evt *Event) IsSchedule() bool {
@@ -200,47 +190,6 @@ func (evt *Event) Schedules() []map[string]string {
 	return evt.schedules
 }
 
-func (evt *Event) Inputs() []WorkflowDispatchInput {
-	return evt.inputs
-}
-
-func parseWorkflowDispatchInputs(inputs map[string]interface{}) ([]WorkflowDispatchInput, error) {
-	var results []WorkflowDispatchInput
-	for name, input := range inputs {
-		inputMap, ok := input.(map[string]interface{})
-		if !ok {
-			return nil, fmt.Errorf("invalid input: %v", input)
-		}
-		input := WorkflowDispatchInput{
-			Name: name,
-		}
-		if desc, ok := inputMap["description"].(string); ok {
-			input.Description = desc
-		}
-		if required, ok := inputMap["required"].(bool); ok {
-			input.Required = required
-		}
-		if defaultVal, ok := inputMap["default"].(string); ok {
-			input.Default = defaultVal
-		}
-		if inputType, ok := inputMap["type"].(string); ok {
-			input.Type = inputType
-		}
-		if options, ok := inputMap["options"].([]string); ok {
-			input.Options = options
-		} else if options, ok := inputMap["options"].([]interface{}); ok {
-			for _, option := range options {
-				if opt, ok := option.(string); ok {
-					input.Options = append(input.Options, opt)
-				}
-			}
-		}
-
-		results = append(results, input)
-	}
-	return results, nil
-}
-
 func ParseRawOn(rawOn *yaml.Node) ([]*Event, error) {
 	switch rawOn.Kind {
 	case yaml.ScalarNode:
@@ -269,119 +218,79 @@ func ParseRawOn(rawOn *yaml.Node) ([]*Event, error) {
 		}
 		return res, nil
 	case yaml.MappingNode:
-		events, triggers, err := parseMappingNode[yaml.Node](rawOn)
+		events, triggers, err := parseMappingNode[interface{}](rawOn)
 		if err != nil {
 			return nil, err
 		}
 		res := make([]*Event, 0, len(events))
 		for i, k := range events {
 			v := triggers[i]
-			switch v.Kind {
+			if v == nil {
-			case yaml.ScalarNode:
 				res = append(res, &Event{
 					Name: k,
+					acts: map[string][]string{},
 				})
-			case yaml.SequenceNode:
+				continue
-				var t []interface{}
+			}
-				err := v.Decode(&t)
+			switch t := v.(type) {
-				if err != nil {
+			case string:
-					return nil, err
+				res = append(res, &Event{
-				}
+					Name: k,
-				schedules := make([]map[string]string, len(t))
+					acts: map[string][]string{},
-				if k == "schedule" {
+				})
-					for i, tt := range t {
+			case []string:
-						vv, ok := tt.(map[string]interface{})
+				res = append(res, &Event{
-						if !ok {
+					Name: k,
-							return nil, fmt.Errorf("unknown on type(schedule): %#v", v)
+					acts: map[string][]string{},
-						}
+				})
-						schedules[i] = make(map[string]string, len(vv))
+			case map[string]interface{}:
-						for k, vvv := range vv {
+				acts := make(map[string][]string, len(t))
+				for act, branches := range t {
+					switch b := branches.(type) {
+					case string:
+						acts[act] = []string{b}
+					case []string:
+						acts[act] = b
+					case []interface{}:
+						acts[act] = make([]string, len(b))
+						for i, v := range b {
 							var ok bool
-							if schedules[i][k], ok = vvv.(string); !ok {
+							if acts[act][i], ok = v.(string); !ok {
-								return nil, fmt.Errorf("unknown on type(schedule): %#v", v)
+								return nil, fmt.Errorf("unknown on type: %#v", branches)
 							}
 						}
+					default:
+						return nil, fmt.Errorf("unknown on type: %#v", branches)
 					}
 				}
-
+				res = append(res, &Event{
-				if len(schedules) == 0 {
+					Name: k,
-					schedules = nil
+					acts: acts,
+				})
+			case []interface{}:
+				if k != "schedule" {
+					return nil, fmt.Errorf("unknown on type: %#v", v)
+				}
+				schedules := make([]map[string]string, len(t))
+				for i, tt := range t {
+					vv, ok := tt.(map[string]interface{})
+					if !ok {
+						return nil, fmt.Errorf("unknown on type: %#v", v)
+					}
+					schedules[i] = make(map[string]string, len(vv))
+					for k, vvv := range vv {
+						var ok bool
+						if schedules[i][k], ok = vvv.(string); !ok {
+							return nil, fmt.Errorf("unknown on type: %#v", v)
+						}
+					}
 				}
 				res = append(res, &Event{
 					Name:      k,
 					schedules: schedules,
 				})
-			case yaml.MappingNode:
-				acts := make(map[string][]string, len(v.Content)/2)
-				var inputs []WorkflowDispatchInput
-				expectedKey := true
-				var act string
-				for _, content := range v.Content {
-					if expectedKey {
-						if content.Kind != yaml.ScalarNode {
-							return nil, fmt.Errorf("key type not string: %#v", content)
-						}
-						act = ""
-						err := content.Decode(&act)
-						if err != nil {
-							return nil, err
-						}
-					} else {
-						switch content.Kind {
-						case yaml.SequenceNode:
-							var t []string
-							err := content.Decode(&t)
-							if err != nil {
-								return nil, err
-							}
-							acts[act] = t
-						case yaml.MappingNode:
-							if k != "workflow_dispatch" || act != "inputs" {
-								return nil, fmt.Errorf("map should only for workflow_dispatch but %s: %#v", act, content)
-							}
-
-							var key string
-							for i, vv := range content.Content {
-								if i%2 == 0 {
-									if vv.Kind != yaml.ScalarNode {
-										return nil, fmt.Errorf("key type not string: %#v", vv)
-									}
-									key = ""
-									if err := vv.Decode(&key); err != nil {
-										return nil, err
-									}
-								} else {
-									if vv.Kind != yaml.MappingNode {
-										return nil, fmt.Errorf("key type not map(%s): %#v", key, vv)
-									}
-
-									input := WorkflowDispatchInput{}
-									if err := vv.Decode(&input); err != nil {
-										return nil, err
-									}
-									input.Name = key
-									inputs = append(inputs, input)
-								}
-							}
-						default:
-							return nil, fmt.Errorf("unknown on type: %#v", content)
-						}
-					}
-					expectedKey = !expectedKey
-				}
-				if len(inputs) == 0 {
-					inputs = nil
-				}
-				if len(acts) == 0 {
-					acts = nil
-				}
-				res = append(res, &Event{
-					Name:   k,
-					acts:   acts,
-					inputs: inputs,
-				})
 			default:
-				return nil, fmt.Errorf("unknown on type: %v", v.Kind)
+				return nil, fmt.Errorf("unknown on type: %#v", v)
 			}
 		}
 		return res, nil

pkg/jobparser/model_test.go

@@ -186,60 +186,6 @@ func TestParseRawOn(t *testing.T) {
 				},
 			},
 		},
-		{
-			input: `on:
-  workflow_dispatch:
-    inputs:
-      logLevel:
-        description: 'Log level'
-        required: true
-        default: 'warning'
-        type: choice
-        options:
-        - info
-        - warning
-        - debug
-      tags:
-        description: 'Test scenario tags'
-        required: false
-        type: boolean
-      environment:
-        description: 'Environment to run tests against'
-        type: environment
-        required: true
-  push:
-`,
-			result: []*Event{
-				{
-					Name: "workflow_dispatch",
-					inputs: []WorkflowDispatchInput{
-						{
-							Name:        "logLevel",
-							Description: "Log level",
-							Required:    true,
-							Default:     "warning",
-							Type:        "choice",
-							Options:     []string{"info", "warning", "debug"},
-						},
-						{
-							Name:        "tags",
-							Description: "Test scenario tags",
-							Required:    false,
-							Type:        "boolean",
-						},
-						{
-							Name:        "environment",
-							Description: "Environment to run tests against",
-							Type:        "environment",
-							Required:    true,
-						},
-					},
-				},
-				{
-					Name: "push",
-				},
-			},
-		},
 	}
 	for _, kase := range kases {
 		t.Run(kase.input, func(t *testing.T) {
@@ -284,7 +230,8 @@ func TestParseMappingNode(t *testing.T) {
 		{
 			input:   "on:\n  push:\n    branches:\n      - master",
 			scalars: []string{"push"},
-			datas: []interface{}{
+			datas: []interface {
+			}{
 				map[string]interface{}{
 					"branches": []interface{}{"master"},
 				},

pkg/model/workflow.go

@@ -1,7 +1,6 @@
 package model
 
 import (
-	"crypto/sha256"
 	"fmt"
 	"io"
 	"reflect"
@@ -9,10 +8,9 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/nektos/act/pkg/common"
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v3"
-
-	"github.com/nektos/act/pkg/common"
 )
 
 // Workflow is the structure of the files in .github/workflows
@@ -718,12 +716,6 @@ func (s *Step) Type() StepType {
 	return StepTypeUsesActionRemote
 }
 
-// UsesHash returns a hash of the uses string.
-// For Gitea.
-func (s *Step) UsesHash() string {
-	return fmt.Sprintf("%x", sha256.Sum256([]byte(s.Uses)))
-}
-
 // ReadWorkflow returns a list of jobs for a given workflow file reader
 func ReadWorkflow(in io.Reader) (*Workflow, error) {
 	w := new(Workflow)

pkg/model/workflow_test.go

@@ -603,37 +603,3 @@ func TestReadWorkflow_WorkflowDispatchConfig(t *testing.T) {
 		Type:     "choice",
 	}, workflowDispatch.Inputs["logLevel"])
 }
-
-func TestStep_UsesHash(t *testing.T) {
-	type fields struct {
-		Uses string
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		want   string
-	}{
-		{
-			name: "regular",
-			fields: fields{
-				Uses: "https://gitea.com/testa/testb@v3",
-			},
-			want: "ae437878e9f285bd7518c58664f9fabbb12d05feddd7169c01702a2a14322aa8",
-		},
-		{
-			name: "empty",
-			fields: fields{
-				Uses: "",
-			},
-			want: "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := &Step{
-				Uses: tt.fields.Uses,
-			}
-			assert.Equalf(t, tt.want, s.UsesHash(), "UsesHash()")
-		})
-	}
-}

pkg/runner/action.go

@@ -535,7 +535,7 @@ func runPreStep(step actionStep) common.Executor {
 			var actionPath string
 			if _, ok := step.(*stepActionRemote); ok {
 				actionPath = newRemoteAction(stepModel.Uses).Path
-				actionDir = fmt.Sprintf("%s/%s", rc.ActionCacheDir(), stepModel.UsesHash())
+				actionDir = fmt.Sprintf("%s/%s", rc.ActionCacheDir(), safeFilename(stepModel.Uses))
 			} else {
 				actionDir = filepath.Join(rc.Config.Workdir, stepModel.Uses)
 				actionPath = ""
@@ -579,7 +579,7 @@ func runPreStep(step actionStep) common.Executor {
 			var actionPath string
 			if _, ok := step.(*stepActionRemote); ok {
 				actionPath = newRemoteAction(stepModel.Uses).Path
-				actionDir = fmt.Sprintf("%s/%s", rc.ActionCacheDir(), stepModel.UsesHash())
+				actionDir = fmt.Sprintf("%s/%s", rc.ActionCacheDir(), safeFilename(stepModel.Uses))
 			} else {
 				actionDir = filepath.Join(rc.Config.Workdir, stepModel.Uses)
 				actionPath = ""
@@ -665,7 +665,7 @@ func runPostStep(step actionStep) common.Executor {
 		var actionPath string
 		if _, ok := step.(*stepActionRemote); ok {
 			actionPath = newRemoteAction(stepModel.Uses).Path
-			actionDir = fmt.Sprintf("%s/%s", rc.ActionCacheDir(), stepModel.UsesHash())
+			actionDir = fmt.Sprintf("%s/%s", rc.ActionCacheDir(), safeFilename(stepModel.Uses))
 		} else {
 			actionDir = filepath.Join(rc.Config.Workdir, stepModel.Uses)
 			actionPath = ""

pkg/runner/job_executor.go

@@ -185,8 +185,7 @@ func setJobResult(ctx context.Context, info jobInfo, rc *RunContext, success boo
 	info.result(jobResult)
 	if rc.caller != nil {
 		// set reusable workflow job result
-		rc.caller.setReusedWorkflowJobResult(rc.JobName, jobResult) // For Gitea
+		rc.caller.runContext.result(jobResult)
-		return
 	}
 
 	jobResultMessage := "succeeded"

pkg/runner/reusable_workflow.go

@@ -175,11 +175,7 @@ func newReusableWorkflowExecutor(rc *RunContext, directory string, workflow stri
 			return err
 		}
 
-		// return runner.NewPlanExecutor(plan)(ctx)
+		return runner.NewPlanExecutor(plan)(ctx)
-		return common.NewPipelineExecutor( // For Gitea
-			runner.NewPlanExecutor(plan),
-			setReusedWorkflowCallerResult(rc, runner),
-		)(ctx)
 	}
 }
 
@@ -189,8 +185,6 @@ func NewReusableWorkflowRunner(rc *RunContext) (Runner, error) {
 		eventJSON: rc.EventJSON,
 		caller: &caller{
 			runContext: rc,
-
-			reusedWorkflowJobResults: map[string]string{}, // For Gitea
 		},
 	}
 
@@ -275,47 +269,3 @@ func newRemoteReusableWorkflow(uses string) *remoteReusableWorkflow {
 		URL:      "https://github.com",
 	}
 }
-
-// For Gitea
-func setReusedWorkflowCallerResult(rc *RunContext, runner Runner) common.Executor {
-	return func(ctx context.Context) error {
-		logger := common.Logger(ctx)
-
-		runnerImpl, ok := runner.(*runnerImpl)
-		if !ok {
-			logger.Warn("Failed to get caller from runner")
-			return nil
-		}
-		caller := runnerImpl.caller
-
-		allJobDone := true
-		hasFailure := false
-		for _, result := range caller.reusedWorkflowJobResults {
-			if result == "pending" {
-				allJobDone = false
-				break
-			}
-			if result == "failure" {
-				hasFailure = true
-			}
-		}
-
-		if allJobDone {
-			reusedWorkflowJobResult := "success"
-			reusedWorkflowJobResultMessage := "succeeded"
-			if hasFailure {
-				reusedWorkflowJobResult = "failure"
-				reusedWorkflowJobResultMessage = "failed"
-			}
-
-			if rc.caller != nil {
-				rc.caller.setReusedWorkflowJobResult(rc.JobName, reusedWorkflowJobResult)
-			} else {
-				rc.result(reusedWorkflowJobResult)
-				logger.WithField("jobResult", reusedWorkflowJobResult).Infof("\U0001F3C1  Job %s", reusedWorkflowJobResultMessage)
-			}
-		}
-
-		return nil
-	}
-}

pkg/runner/run_context.go

@@ -92,12 +92,7 @@ func (rc *RunContext) GetEnv() map[string]string {
 }
 
 func (rc *RunContext) jobContainerName() string {
-	nameParts := []string{rc.Config.ContainerNamePrefix, "WORKFLOW-" + rc.Run.Workflow.Name, "JOB-" + rc.Name}
+	return createSimpleContainerName(rc.Config.ContainerNamePrefix, "WORKFLOW-"+rc.Run.Workflow.Name, "JOB-"+rc.Name)
-	if rc.caller != nil {
-		nameParts = append(nameParts, "CALLED-BY-"+rc.caller.runContext.JobName)
-	}
-	// return createSimpleContainerName(rc.Config.ContainerNamePrefix, "WORKFLOW-"+rc.Run.Workflow.Name, "JOB-"+rc.Name)
-	return createSimpleContainerName(nameParts...) // For Gitea
 }
 
 // Deprecated: use `networkNameForGitea`
@@ -658,7 +653,6 @@ func (rc *RunContext) Executor() (common.Executor, error) {
 	return func(ctx context.Context) error {
 		res, err := rc.isEnabled(ctx)
 		if err != nil {
-			rc.caller.setReusedWorkflowJobResult(rc.JobName, "failure") // For Gitea
 			return err
 		}
 		if res {
@@ -754,10 +748,6 @@ func (rc *RunContext) isEnabled(ctx context.Context) (bool, error) {
 	}
 
 	if !runJob {
-		if rc.caller != nil { // For Gitea
-			rc.caller.setReusedWorkflowJobResult(rc.JobName, "skipped")
-			return false, nil
-		}
 		l.WithField("jobResult", "skipped").Debugf("Skipping job '%s' due to '%s'", job.Name, job.If.Value)
 		return false, nil
 	}

pkg/runner/runner.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"os"
 	"runtime"
-	"sync"
 	"time"
 
 	docker_container "github.com/docker/docker/api/types/container"
@@ -87,9 +86,6 @@ func (c Config) GetToken() string {
 
 type caller struct {
 	runContext *RunContext
-
-	updateResultLock         sync.Mutex        // For Gitea
-	reusedWorkflowJobResults map[string]string // For Gitea
 }
 
 type runnerImpl struct {
@@ -210,9 +206,6 @@ func (runner *runnerImpl) NewPlanExecutor(plan *model.Plan) common.Executor {
 					if len(rc.String()) > maxJobNameLen {
 						maxJobNameLen = len(rc.String())
 					}
-					if rc.caller != nil { // For Gitea
-						rc.caller.setReusedWorkflowJobResult(rc.JobName, "pending")
-					}
 					stageExecutor = append(stageExecutor, func(ctx context.Context) error {
 						jobName := fmt.Sprintf("%-*s", maxJobNameLen, rc.String())
 						executor, err := rc.Executor()
@@ -284,10 +277,3 @@ func (runner *runnerImpl) newRunContext(ctx context.Context, run *model.Run, mat
 
 	return rc
 }
-
-// For Gitea
-func (c *caller) setReusedWorkflowJobResult(jobName string, result string) {
-	c.updateResultLock.Lock()
-	defer c.updateResultLock.Unlock()
-	c.reusedWorkflowJobResults[jobName] = result
-}

pkg/runner/step_action_remote.go

@@ -108,7 +108,7 @@ func (sar *stepActionRemote) prepareActionExecutor() common.Executor {
 			return err
 		}
 
-		actionDir := fmt.Sprintf("%s/%s", sar.RunContext.ActionCacheDir(), sar.Step.UsesHash())
+		actionDir := fmt.Sprintf("%s/%s", sar.RunContext.ActionCacheDir(), safeFilename(sar.Step.Uses))
 		gitClone := stepActionRemoteNewCloneExecutor(git.NewGitCloneExecutorInput{
 			URL:   sar.remoteAction.CloneURL(sar.RunContext.Config.DefaultActionInstance),
 			Ref:   sar.remoteAction.Ref,
@@ -177,7 +177,7 @@ func (sar *stepActionRemote) main() common.Executor {
 				return sar.RunContext.JobContainer.CopyDir(copyToPath, sar.RunContext.Config.Workdir+string(filepath.Separator)+".", sar.RunContext.Config.UseGitIgnore)(ctx)
 			}
 
-			actionDir := fmt.Sprintf("%s/%s", sar.RunContext.ActionCacheDir(), sar.Step.UsesHash())
+			actionDir := fmt.Sprintf("%s/%s", sar.RunContext.ActionCacheDir(), safeFilename(sar.Step.Uses))
 
 			return sar.runAction(sar, actionDir, sar.remoteAction)(ctx)
 		}),
@@ -236,7 +236,7 @@ func (sar *stepActionRemote) getActionModel() *model.Action {
 
 func (sar *stepActionRemote) getCompositeRunContext(ctx context.Context) *RunContext {
 	if sar.compositeRunContext == nil {
-		actionDir := fmt.Sprintf("%s/%s", sar.RunContext.ActionCacheDir(), sar.Step.UsesHash())
+		actionDir := fmt.Sprintf("%s/%s", sar.RunContext.ActionCacheDir(), safeFilename(sar.Step.Uses))
 		actionLocation := path.Join(actionDir, sar.remoteAction.Path)
 		_, containerActionDir := getContainerActionPaths(sar.getStepModel(), actionLocation, sar.RunContext)