mirror of
https://github.com/go-task/task.git
synced 2025-08-10 22:42:19 +02:00
Fix bug in includes where default taskfiles were not being checked.
This commit is contained in:
@@ -758,7 +758,11 @@ func TestIncludesMultiLevel(t *testing.T) {
|
|||||||
Dir: "testdata/includes_multi_level",
|
Dir: "testdata/includes_multi_level",
|
||||||
Target: "default",
|
Target: "default",
|
||||||
TrimSpace: true,
|
TrimSpace: true,
|
||||||
Files: map[string]string{},
|
Files: map[string]string{
|
||||||
|
"called_one.txt": "one",
|
||||||
|
"called_two.txt": "two",
|
||||||
|
"called_three.txt": "three",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
tt.Run(t)
|
tt.Run(t)
|
||||||
}
|
}
|
||||||
|
@@ -76,6 +76,13 @@ func Taskfile(readerNode *ReaderNode) (*taskfile.Taskfile, error) {
|
|||||||
if !filepath.IsAbs(path) {
|
if !filepath.IsAbs(path) {
|
||||||
path = filepath.Join(readerNode.Dir, path)
|
path = filepath.Join(readerNode.Dir, path)
|
||||||
}
|
}
|
||||||
|
path, err = exists(path)
|
||||||
|
if err != nil {
|
||||||
|
if includedTask.Optional {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
includeReaderNode := &ReaderNode{
|
includeReaderNode := &ReaderNode{
|
||||||
Dir: filepath.Dir(path),
|
Dir: filepath.Dir(path),
|
||||||
|
4
testdata/includes_multi_level/Taskfile.yml
vendored
4
testdata/includes_multi_level/Taskfile.yml
vendored
@@ -1,9 +1,11 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
|
|
||||||
includes:
|
includes:
|
||||||
'one': ./one/Taskfile.yml
|
'one': ./one/
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
default:
|
default:
|
||||||
cmds:
|
cmds:
|
||||||
|
- task: one:default
|
||||||
- task: one:two:default
|
- task: one:two:default
|
||||||
|
- task: one:two:three:default
|
||||||
|
1
testdata/includes_multi_level/called_one.txt
vendored
Normal file
1
testdata/includes_multi_level/called_one.txt
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
one
|
1
testdata/includes_multi_level/called_three.txt
vendored
Normal file
1
testdata/includes_multi_level/called_three.txt
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
three
|
1
testdata/includes_multi_level/called_two.txt
vendored
Normal file
1
testdata/includes_multi_level/called_two.txt
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
two
|
@@ -1,9 +1,7 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
|
|
||||||
includes:
|
includes:
|
||||||
'two': ./two/Taskfile.yml
|
'two': ./two/
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
level1:
|
default: echo one > called_one.txt
|
||||||
cmds:
|
|
||||||
- echo "hello level 1"
|
|
@@ -1,6 +1,7 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
|
|
||||||
|
includes:
|
||||||
|
'three': ./three/Taskfile.yml
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
default:
|
default: echo two > called_two.txt
|
||||||
cmds:
|
|
||||||
- echo "called_dep" > called_dep.txt
|
|
||||||
|
4
testdata/includes_multi_level/one/two/three/Taskfile.yml
vendored
Normal file
4
testdata/includes_multi_level/one/two/three/Taskfile.yml
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
|
tasks:
|
||||||
|
default: echo three > called_three.txt
|
Reference in New Issue
Block a user