mirror of
https://github.com/go-task/task.git
synced 2025-11-25 22:32:55 +02:00
Manually implement merging of Taskfiles and remove dependency on github.com/imdario/mergo
I was carreful enough to check the behavior keeps the same
This commit is contained in:
27
internal/taskfile/merge.go
Normal file
27
internal/taskfile/merge.go
Normal file
@@ -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
|
||||||
|
}
|
||||||
@@ -8,7 +8,6 @@ import (
|
|||||||
|
|
||||||
"github.com/go-task/task/internal/taskfile"
|
"github.com/go-task/task/internal/taskfile"
|
||||||
|
|
||||||
"github.com/imdario/mergo"
|
|
||||||
"gopkg.in/yaml.v2"
|
"gopkg.in/yaml.v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -26,10 +25,7 @@ func Taskfile(dir string) (*taskfile.Taskfile, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if t.Version != osTaskfile.Version {
|
if err = taskfile.Merge(t, osTaskfile); err != nil {
|
||||||
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 {
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user