Skip to content

Commit a258f65

Browse files
authored
Merge pull request #38 from chrisgavin/concise-map-syntax
Add support for concise map syntax.
2 parents da7d0a8 + 7767af8 commit a258f65

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

internal/workflow/workflow.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ func ReadWorkflow(name string, rawWorkflow []byte) (*Workflow, error) {
7878
if err != nil {
7979
return nil, errors.Wrap(err, "Unable to parse workflow as typed YAML.")
8080
}
81-
if typedParsedWorkflow.On.WorkflowDispatch != nil {
81+
if workflowDispatchTrigger, ok := typedOn[workflowDispatch]; ok && workflowDispatchTrigger == nil {
82+
workflow.Dispatchable = true
83+
} else if typedParsedWorkflow.On.WorkflowDispatch != nil {
8284
workflow.Dispatchable = true
8385
if typedParsedWorkflow.On.WorkflowDispatch.Inputs != nil {
8486
for _, inputData := range *typedParsedWorkflow.On.WorkflowDispatch.Inputs {

internal/workflow/workflow_test.go

+12
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,18 @@ on:
5555
require.Empty(t, workflowData.Inputs)
5656
}
5757

58+
func TestReadDispatchableWorkflowConciseMapStyle(t *testing.T) {
59+
const workflowContent = `
60+
on:
61+
push:
62+
pull_request:
63+
workflow_dispatch:
64+
`
65+
workflowData := parseTestWorkflow(t, workflowContent)
66+
require.True(t, workflowData.Dispatchable)
67+
require.Empty(t, workflowData.Inputs)
68+
}
69+
5870
func TestReadWorkflowWithInputs(t *testing.T) {
5971
const workflowContent = `
6072
on:

0 commit comments

Comments
 (0)