Update skip_path to new logic.

pipeline.go

@@ -109,33 +109,71 @@ func stepsToTrigger(files []string, watch []WatchConfig) ([]Step, error) {
 			defaultStep = &w.Step
 			continue
 		}
-		for _, p := range w.Paths {
-			for _, f := range files {
-				match, err := matchPath(p, f)
 
-				skip := false
-				for _, sp := range w.SkipPaths {
-					skipMatch, errSkip := matchPath(sp, f)
+		match := false
+		skip := false
+		for _, f := range files {
+			for _, p := range w.Paths {
 
-					if errSkip != nil {
-						return nil, errSkip
-					}
+				m, err := matchPath(p, f)
+				if err != nil {
+					return nil, err
+				}
 
-					if skipMatch {
-						skip = true
-					}
+				if m {
+					log.Printf("matched: %s\n", f)
+					match = true
+					break
 				}
+			}
 
+			for _, sp := range w.SkipPaths {
+
+				sm, err := matchPath(sp, f)
 				if err != nil {
 					return nil, err
 				}
 
-				if match && !skip {
-					steps = append(steps, w.Step)
+				if sm {
+					log.Printf("skipped: %s\n", f)
+					skip = true
 					break
 				}
 			}
 		}
+
+		if match && !skip {
+			log.Printf("adding step: %s\n", w.Step.Trigger)
+			steps = append(steps, w.Step)
+		}
+
+		// for _, p := range w.Paths {
+		// 	for _, f := range files {
+		// 		match, err := matchPath(p, f)
+		//
+		// 		skip := false
+		// 		for _, sp := range w.SkipPaths {
+		// 			skipMatch, errSkip := matchPath(sp, f)
+		//
+		// 			if errSkip != nil {
+		// 				return nil, errSkip
+		// 			}
+		//
+		// 			if skipMatch {
+		// 				skip = true
+		// 			}
+		// 		}
+		//
+		// 		if err != nil {
+		// 			return nil, err
+		// 		}
+		//
+		// 		if match && !skip {
+		// 			steps = append(steps, w.Step)
+		// 			break
+		// 		}
+		// 	}
+		// }
 	}
 
 	if len(steps) == 0 && defaultStep != nil {

pipeline_test.go

@@ -339,7 +339,7 @@ func TestPipelinesStepsToTrigger(t *testing.T) {
 				{Trigger: "service-1"},
 			},
 		},
-		"step is included even when one of the files is skipped": {
+		"step is not included if one of the files is skipped": {
 			ChangedFiles: []string{
 				"docs/text.secret.txt",
 				"docs/text.txt",
@@ -356,7 +356,6 @@ func TestPipelinesStepsToTrigger(t *testing.T) {
 				}},
 			Expected: []Step{
 				{Trigger: "service-1"},
-				{Trigger: "service-2"},
 			},
 		},
 		"fails if not path is included": {
@@ -370,6 +369,26 @@ func TestPipelinesStepsToTrigger(t *testing.T) {
 				}},
 			Expected: []Step{},
 		},
+		"skips if one file matches": {
+			ChangedFiles: []string{
+				"docs/secret/secret.txt",
+				"docs/test/test.txt",
+				"docs/README.md",
+			},
+			WatchConfigs: []WatchConfig{
+				{
+					Paths: []string{"**/*"},
+					Step:  Step{Trigger: "service-1"},
+				},
+				{
+					Paths:     []string{"**/*"},
+					SkipPaths: []string{"docs/test/**/*"},
+					Step:      Step{Trigger: "service-2"},
+				}},
+			Expected: []Step{
+				{Trigger: "service-1"},
+			},
+		},
 	}
 
 	for name, tc := range testCases {