go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-11-23 22:24:45 +02:00
Code Issues Releases Activity

fix: matrix loops should be deterministic (#1784)

Browse Source
This commit is contained in:
Pete Davison
2024-09-02 22:43:54 +01:00
committed by GitHub
parent a3bdb6c40a
commit e4b4d04abd
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
taskfile/ast/for.go
View File

@@ -5,12 +5,13 @@ import (
"github.com/go-task/task/v3/errors"
"github.com/go-task/task/v3/internal/deepcopy"
"github.com/go-task/task/v3/internal/omap"
)
type For struct {
From string
List []any
Matrix map[string][]any
Matrix omap.OrderedMap[string, []any]
Var string
Split string
As string
@@ -37,7 +38,7 @@ func (f *For) UnmarshalYAML(node *yaml.Node) error {
case yaml.MappingNode:
var forStruct struct {
Matrix map[string][]any
Matrix omap.OrderedMap[string, []any]
Var string
Split string
As string
@@ -45,10 +46,10 @@ func (f *For) UnmarshalYAML(node *yaml.Node) error {
if err := node.Decode(&forStruct); err != nil {
return errors.NewTaskfileDecodeError(err, node)
}
if forStruct.Var == "" && forStruct.Matrix == nil {
if forStruct.Var == "" && forStruct.Matrix.Len() == 0 {
return errors.NewTaskfileDecodeError(nil, node).WithMessage("invalid keys in for")
}
if forStruct.Var != "" && forStruct.Matrix != nil {
if forStruct.Var != "" && forStruct.Matrix.Len() != 0 {
return errors.NewTaskfileDecodeError(nil, node).WithMessage("cannot use both var and matrix in for")
}
f.Matrix = forStruct.Matrix
@@ -68,7 +69,7 @@ func (f *For) DeepCopy() *For {
return &For{
From: f.From,
List: deepcopy.Slice(f.List),
Matrix: deepcopy.Map(f.Matrix),
Matrix: f.Matrix.DeepCopy(),
Var: f.Var,
Split: f.Split,
As: f.As,