Skip to content

Commit

Permalink
Manually implement merging of Taskfiles and remove dependency on gith…
Browse files Browse the repository at this point in the history
…ub.com/imdario/mergo

I was carreful enough to check the behavior keeps the same
  • Loading branch information
andreynering committed Jul 22, 2018
1 parent da1b0c9 commit cc6f7b6
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 5 deletions.
27 changes: 27 additions & 0 deletions internal/taskfile/merge.go
@@ -0,0 +1,27 @@
package taskfile

import (
"fmt"
)

// Merge merges the second Taskfile into the first
func Merge(t1, t2 *Taskfile) error {
if t1.Version != t2.Version {
return fmt.Errorf(`Taskfiles versions should match. First is "%s" but second is "%s"`, t1.Version, t2.Version)
}

if t2.Expansions != 0 && t2.Expansions != 2 {
t1.Expansions = t2.Expansions
}
if t2.Output != "" {
t1.Output = t2.Output
}
for k, v := range t2.Vars {
t1.Vars[k] = v
}
for k, v := range t2.Tasks {
t1.Tasks[k] = v
}

return nil
}
6 changes: 1 addition & 5 deletions internal/taskfile/read/taskfile.go
Expand Up @@ -8,7 +8,6 @@ import (

"github.com/go-task/task/internal/taskfile"

"github.com/imdario/mergo"
"gopkg.in/yaml.v2"
)

Expand All @@ -26,10 +25,7 @@ func Taskfile(dir string) (*taskfile.Taskfile, error) {
if err != nil {
return nil, err
}
if t.Version != osTaskfile.Version {
return nil, fmt.Errorf(`Taskfile versions should match. Taskfile.yml is "%s" but Taskfile_%s.yml is "%s"`, t.Version, runtime.GOOS, osTaskfile.Version)
}
if err = mergo.MapWithOverwrite(&t.Tasks, osTaskfile.Tasks); err != nil {
if err = taskfile.Merge(t, osTaskfile); err != nil {
return nil, err
}
}
Expand Down

0 comments on commit cc6f7b6

Please sign in to comment.