Support specifying command for services (#50)

This PR is to support overwriting the default `CMD` command of `services` containers.

This is a Gitea specific feature and GitHub Actions doesn't support this syntax.

Reviewed-on: https://gitea.com/gitea/act/pulls/50
Reviewed-by: Jason Song <i@wolfogre.com>
Co-authored-by: Zettat123 <zettat123@gmail.com>
Co-committed-by: Zettat123 <zettat123@gmail.com>

pkg/jobparser/jobparser_test.go

@@ -42,6 +42,11 @@ func TestParse(t *testing.T) {
 			options: nil,
 			wantErr: false,
 		},
+		{
+			name:    "empty_step",
+			options: nil,
+			wantErr: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

pkg/jobparser/model.go

@@ -40,6 +40,13 @@ func (w *SingleWorkflow) jobs() ([]string, []*Job, error) {
 			if err := item.Decode(job); err != nil {
 				return nil, nil, fmt.Errorf("yaml.Unmarshal: %w", err)
 			}
+			steps := make([]*Step, 0, len(job.Steps))
+			for _, s := range job.Steps {
+				if s != nil {
+					steps = append(steps, s)
+				}
+			}
+			job.Steps = steps
 			jobs = append(jobs, job)
 			expectKey = true
 		}
@@ -143,6 +150,9 @@ type Step struct {
 
 // String gets the name of step
 func (s *Step) String() string {
+	if s == nil {
+		return ""
+	}
 	return (&model.Step{
 		ID:   s.ID,
 		Name: s.Name,
@@ -158,6 +168,7 @@ type ContainerSpec struct {
 	Volumes     []string          `yaml:"volumes,omitempty"`
 	Options     string            `yaml:"options,omitempty"`
 	Credentials map[string]string `yaml:"credentials,omitempty"`
+	Cmd         []string          `yaml:"cmd,omitempty"`
 }
 
 type Strategy struct {

pkg/jobparser/testdata/empty_step.in.yaml

@@ -0,0 +1,8 @@
+name: test
+jobs:
+  job1:
+    name: job1
+    runs-on: linux
+    steps:
+      - run: echo job-1
+      -

pkg/jobparser/testdata/empty_step.out.yaml

@@ -0,0 +1,7 @@
+name: test
+jobs:
+  job1:
+    name: job1
+    runs-on: linux
+    steps:
+      - run: echo job-1

pkg/model/workflow.go

@@ -522,6 +522,9 @@ type ContainerSpec struct {
 	Args        string
 	Name        string
 	Reuse       bool
+
+	// Gitea specific
+	Cmd []string `yaml:"cmd"`
 }
 
 // Step is the structure of one step in a job

pkg/runner/run_context.go

@@ -246,9 +246,19 @@ func (rc *RunContext) startJobContainer() common.Executor {
 
 		// add service containers
 		for name, spec := range rc.Run.Job().Services {
-			mergedEnv := envList
+			// interpolate env
+			interpolatedEnvs := make(map[string]string, len(spec.Env))
 			for k, v := range spec.Env {
-				mergedEnv = append(mergedEnv, fmt.Sprintf("%s=%s", k, v))
+				interpolatedEnvs[k] = rc.ExprEval.Interpolate(ctx, v)
+			}
+			envs := make([]string, 0, len(interpolatedEnvs))
+			for k, v := range interpolatedEnvs {
+				envs = append(envs, fmt.Sprintf("%s=%s", k, v))
+			}
+			// interpolate cmd
+			interpolatedCmd := make([]string, 0, len(spec.Cmd))
+			for _, v := range spec.Cmd {
+				interpolatedCmd = append(interpolatedCmd, rc.ExprEval.Interpolate(ctx, v))
 			}
 			serviceContainerName := createSimpleContainerName(rc.jobContainerName(), name)
 			c := container.NewContainer(&container.NewContainerInput{
@@ -257,7 +267,8 @@ func (rc *RunContext) startJobContainer() common.Executor {
 				Image:      spec.Image,
 				Username:   username,
 				Password:   password,
-				Env:        mergedEnv,
+				Cmd:        interpolatedCmd,
+				Env:        envs,
 				Mounts: map[string]string{
 					// TODO merge volumes
 					name:            ext.ToContainerPath(rc.Config.Workdir),
@@ -271,6 +282,7 @@ func (rc *RunContext) startJobContainer() common.Executor {
 				UsernsMode:     rc.Config.UsernsMode,
 				Platform:       rc.Config.ContainerArchitecture,
 				AutoRemove:     rc.Config.AutoRemove,
+				Options:        spec.Options,
 				NetworkAliases: []string{name},
 			})
 			rc.ServiceContainers = append(rc.ServiceContainers, c)