Removed automatic inclusion of Taskfiles by OS and update tests

internal/taskfile/read/taskfile.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
-	"strings"
 
 	"github.com/go-task/task/v2/internal/taskfile"
 
@@ -46,21 +45,10 @@ func Taskfile(dir string, entrypoint string) (*taskfile.Taskfile, error) {
 			return nil, ErrIncludedTaskfilesCantHaveIncludes
 		}
 
-		includedTaskDirectory := filepath.Dir(path)
-		includedTaskfileName := strings.TrimSuffix(filepath.Base(path), filepath.Ext(path))
-		path = filepath.Join(includedTaskDirectory, fmt.Sprintf("%s_%s.yml", includedTaskfileName, runtime.GOOS))
-		if _, err = os.Stat(path); err == nil {
-			osIncludedTaskfile, err := readTaskfile(path)
-			if err != nil {
-				return nil, err
-			}
-			if err = taskfile.Merge(includedTaskfile, osIncludedTaskfile); err != nil {
-				return nil, err
-			}
-		}
-
 		for _, task := range includedTaskfile.Tasks {
-			task.Dir = filepath.Join(includedTask.Dir, task.Dir)
+			if !filepath.IsAbs(task.Dir) {
+				task.Dir = filepath.Join(includedTask.Dir, task.Dir)
+			}
 		}
 
 		if err = taskfile.Merge(t, includedTaskfile, namespace); err != nil {

task_test.go

@@ -546,7 +546,6 @@ func TestIncludes(t *testing.T) {
 			"included_taskfile_without_dir.txt":         "included_taskfile_without_dir",
 			"./module2/included_directory_with_dir.txt": "included_directory_with_dir",
 			"./module2/included_taskfile_with_dir.txt":  "included_taskfile_with_dir",
-			"./module3/os_related.txt":                  runtime.GOOS,
 		},
 	}
 	tt.Run(t)

testdata/includes/Taskfile.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 includes:
   included: ./included
@@ -13,9 +13,6 @@ includes:
   included_taskfile_with_dir:
     taskfile:  ./module2/Taskfile.yml
     dir:  ./module2
-  os_related:
-    taskfile:  ./module3/CustomTaskfile.yml
-    dir:  ./module3
 
 tasks:
   default:
@@ -27,7 +24,6 @@ tasks:
       - task: included_taskfile_without_dir:gen_dir
       - task: included_with_dir:gen_file
       - task: included_taskfile_with_dir:gen_dir
-      - task: os_related:gen
 
   gen:
     cmds:

testdata/includes/Taskfile2.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 tasks:
   gen:

testdata/includes/included/Taskfile.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 tasks:
   gen:

testdata/includes/module1/Taskfile.yml

@@ -1,9 +1,10 @@
-version: '2'
+version: '3'
 
 tasks:
   gen_dir:
     cmds:
       - echo included_directory_without_dir > included_directory_without_dir.txt
+
   gen_file:
     cmds:
       - echo included_taskfile_without_dir > included_taskfile_without_dir.txt

testdata/includes/module2/Taskfile.yml

@@ -1,9 +1,10 @@
-version: '2'
+version: '3'
 
 tasks:
   gen_dir:
     cmds:
       - echo included_directory_with_dir > included_directory_with_dir.txt
+
   gen_file:
     cmds:
       - echo included_taskfile_with_dir > included_taskfile_with_dir.txt

testdata/includes/module3/CustomTaskfile.yml

@@ -1,6 +0,0 @@
-version: '2'
-
-tasks:
-  gen:
-    cmds:
-      - echo "INVALID" > os_related.txt

testdata/includes/module3/CustomTaskfile_darwin.yml

@@ -1,6 +0,0 @@
-version: '2'
-
-tasks:
-  gen:
-    cmds:
-      - echo "darwin" > os_related.txt

testdata/includes/module3/CustomTaskfile_linux.yml

@@ -1,6 +0,0 @@
-version: '2'
-
-tasks:
-  gen:
-    cmds:
-      - echo "linux" > os_related.txt

testdata/includes/module3/CustomTaskfile_windows.yml

@@ -1,6 +0,0 @@
-version: '2'
-
-tasks:
-  gen:
-    cmds:
-      - echo "windows" > os_related.txt