mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-20 03:00:43 -05:00
Code Issues Packages Projects Releases 167 Wiki Activity

/go/libraries/doltcore/env/actions/dolt_ci: fix types

Browse Source
This commit is contained in:
coffeegoddd
2024-11-12 14:02:08 -08:00
parent 49312668ff
commit b4cd7a06c2
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/libraries/doltcore/env/actions/dolt_ci/workflow_config.go
Vendored
+7 -7
View File
@@ -97,7 +97,7 @@ func ValidateWorkflowConfig(workflow *WorkflowConfig) error {
for _, branch := range workflow.On.Push.Branches {
_, ok := branches[branch.Value]
if ok {
return fmt.Errorf("invalid config: on push branch duplicated: %s", branch)
return fmt.Errorf("invalid config: on push branch duplicated: %s", branch.Value)
} else {
branches[branch.Value] = true
}
@@ -109,7 +109,7 @@ func ValidateWorkflowConfig(workflow *WorkflowConfig) error {
for _, branch := range workflow.On.PullRequest.Branches {
_, ok := branches[branch.Value]
if ok {
return fmt.Errorf("invalid config: on pull request branch duplicated: %s", branch)
return fmt.Errorf("invalid config: on pull request branch duplicated: %s", branch.Value)
} else {
branches[branch.Value] = true
}
@@ -119,7 +119,7 @@ func ValidateWorkflowConfig(workflow *WorkflowConfig) error {
for _, activity := range workflow.On.PullRequest.Activities {
_, ok := activities[activity.Value]
if ok {
return fmt.Errorf("invalid config: on pull request activities duplicated: %s", activity)
return fmt.Errorf("invalid config: on pull request activities duplicated: %s", activity.Value)
} else {
activities[activity.Value] = true
}
@@ -130,17 +130,17 @@ func ValidateWorkflowConfig(workflow *WorkflowConfig) error {
steps := make(map[string]bool)
if len(workflow.Jobs) == 0 {
return fmt.Errorf("invalid config: no jobs defined for workflow: %s", workflow.Name)
return fmt.Errorf("invalid config: no jobs defined for workflow: %s", workflow.Name.Value)
}
for _, job := range workflow.Jobs {
if len(job.Steps) == 0 {
return fmt.Errorf("invalid config: no steps defined for job: %s", job.Name)
return fmt.Errorf("invalid config: no steps defined for job: %s", job.Name.Value)
}
_, ok := jobs[job.Name.Value]
if ok {
return fmt.Errorf("invalid config: job duplicated: %s", job.Name)
return fmt.Errorf("invalid config: job duplicated: %s", job.Name.Value)
} else {
jobs[job.Name.Value] = true
}
@@ -148,7 +148,7 @@ func ValidateWorkflowConfig(workflow *WorkflowConfig) error {
for _, step := range job.Steps {
_, ok := steps[step.Name.Value]
if ok {
return fmt.Errorf("invalid config: step duplicated: %s", step.Name)
return fmt.Errorf("invalid config: step duplicated: %s", step.Name.Value)
} else {
steps[step.Name.Value] = true
}
go/libraries/doltcore/env/actions/dolt_ci/workflow_config_test.go
Vendored
+9 -9
View File
@@ -78,20 +78,20 @@ jobs:
require.NoError(t, err)
require.NotNil(t, wf)
require.Equal(t, workflowName, wf.Name)
require.Equal(t, workflowName, wf.Name.Value)
require.Equal(t, len(wf.On.Push.Branches), 2)
require.Equal(t, len(wf.On.PullRequest.Branches), 2)
require.Equal(t, len(wf.On.PullRequest.Activities), 2)
require.Equal(t, wf.On.Push.Branches[0], mainBranch)
require.Equal(t, wf.On.Push.Branches[1], altBranch)
require.Equal(t, wf.On.PullRequest.Branches[0], mainBranch)
require.Equal(t, wf.On.PullRequest.Branches[1], alt2Branch)
require.Equal(t, wf.On.PullRequest.Activities[0], opened)
require.Equal(t, wf.On.PullRequest.Activities[1], synchronized)
require.Equal(t, wf.On.Push.Branches[0].Value, mainBranch)
require.Equal(t, wf.On.Push.Branches[1].Value, altBranch)
require.Equal(t, wf.On.PullRequest.Branches[0].Value, mainBranch)
require.Equal(t, wf.On.PullRequest.Branches[1].Value, alt2Branch)
require.Equal(t, wf.On.PullRequest.Activities[0].Value, opened)
require.Equal(t, wf.On.PullRequest.Activities[1].Value, synchronized)
require.Equal(t, len(wf.Jobs), 1)
require.Equal(t, wf.Jobs[0].Name, jobName)
require.Equal(t, wf.Jobs[0].Name.Value, jobName)
require.Equal(t, len(wf.Jobs[0].Steps), 1)
require.Equal(t, wf.Jobs[0].Steps[0].Name, stepName)
require.Equal(t, wf.Jobs[0].Steps[0].Name.Value, stepName)
// todo: check expected stuff
}