chore: more fixes

block · Aug 17, 2024 · 6f60fbd · 6f60fbd
1 parent 3dd6160
commit 6f60fbd
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/internal/buildengine/discover_test.go b/internal/buildengine/discover_test.go
@@ -25,7 +25,7 @@ func TestDiscoverModules(t *testing.T) {
 				DeployDir: ".ftl",
 				Schema:    "schema.pb",
 				Errors:    "errors.pb",
-				Watch:     []string{"**/*.go", "go.mod", "go.sum", "../../../go-runtime/ftl/**/*.go"},
+				Watch:     []string{"**/*.go", "go.mod", "go.sum", "../../../../go-runtime/ftl/**/*.go"},
 			},
 		},
 		{
@@ -38,7 +38,7 @@ func TestDiscoverModules(t *testing.T) {
 				DeployDir: ".ftl",
 				Schema:    "schema.pb",
 				Errors:    "errors.pb",
-				Watch:     []string{"**/*.go", "go.mod", "go.sum", "../../../go-runtime/ftl/**/*.go"},
+				Watch:     []string{"**/*.go", "go.mod", "go.sum", "../../../../go-runtime/ftl/**/*.go"},
 			},
 		},
 		{
@@ -141,7 +141,7 @@ func TestDiscoverModules(t *testing.T) {
 				DeployDir: ".ftl",
 				Schema:    "schema.pb",
 				Errors:    "errors.pb",
-				Watch:     []string{"**/*.go", "go.mod", "go.sum", "../../../go-runtime/ftl/**/*.go"},
+				Watch:     []string{"**/*.go", "go.mod", "go.sum", "../../../../go-runtime/ftl/**/*.go"},
 			},
 		},
 		{
@@ -167,7 +167,7 @@ func TestDiscoverModules(t *testing.T) {
 				DeployDir: ".ftl",
 				Schema:    "schema.pb",
 				Errors:    "errors.pb",
-				Watch:     []string{"**/*.go", "go.mod", "go.sum", "../../../go-runtime/ftl/**/*.go"},
+				Watch:     []string{"**/*.go", "go.mod", "go.sum", "../../../../go-runtime/ftl/**/*.go"},
 			},
 		},
 	}

diff --git a/internal/buildengine/testdata/alpha/go.mod b/internal/buildengine/testdata/alpha/go.mod
@@ -45,4 +45,4 @@ require (
 	google.golang.org/protobuf v1.34.2 // indirect
 )
 
-replace github.com/TBD54566975/ftl => ../../..
+replace github.com/TBD54566975/ftl => ../../../..
diff --git a/internal/buildengine/testdata/another/go.mod b/internal/buildengine/testdata/another/go.mod
@@ -45,4 +45,4 @@ require (
 	google.golang.org/protobuf v1.34.2 // indirect
 )
 
-replace github.com/TBD54566975/ftl => ../../..
+replace github.com/TBD54566975/ftl => ../../../..
diff --git a/internal/buildengine/testdata/depcycle2/go.mod b/internal/buildengine/testdata/depcycle2/go.mod
@@ -2,4 +2,4 @@ module ftl/depcycle2
 
 go 1.22.2
 
-replace github.com/TBD54566975/ftl => ./../../../../..
+replace github.com/TBD54566975/ftl => ./../../../..
diff --git a/internal/buildengine/testdata/external/go.mod b/internal/buildengine/testdata/external/go.mod
@@ -2,4 +2,4 @@ module ftl/external
 
 go 1.22.2
 
-replace github.com/TBD54566975/ftl => ../../..
+replace github.com/TBD54566975/ftl => ../../../..
diff --git a/internal/buildengine/testdata/highgoversion/go.mod b/internal/buildengine/testdata/highgoversion/go.mod
@@ -43,4 +43,4 @@ require (
 	google.golang.org/protobuf v1.33.0 // indirect
 )
 
-replace github.com/TBD54566975/ftl => ../../..
+replace github.com/TBD54566975/ftl => ../../../..
diff --git a/internal/buildengine/testdata/integer/go.mod b/internal/buildengine/testdata/integer/go.mod
@@ -4,4 +4,4 @@ go 1.22.2
 
 toolchain go1.22.4
 
-replace github.com/TBD54566975/ftl => /Users/jonathanj/dev/ftl
+replace github.com/TBD54566975/ftl => ../../../..
diff --git a/internal/buildengine/testdata/other/go.mod b/internal/buildengine/testdata/other/go.mod
@@ -45,4 +45,4 @@ require (
 	google.golang.org/protobuf v1.34.2 // indirect
 )
 
-replace github.com/TBD54566975/ftl => ../../..
+replace github.com/TBD54566975/ftl => ../../../..
diff --git a/internal/buildengine/watch_test.go b/internal/buildengine/watch_test.go
@@ -232,7 +232,7 @@ func ftl(args ...string) error {
 
 func updateModFile(t *testing.T, dir string) {
 	t.Helper()
-	cmd := exec.Command("go", "mod", "edit", "-replace=github.com/TBD54566975/ftl=..")
+	cmd := exec.Command("go", "mod", "edit", "-replace=github.com/TBD54566975/ftl=../..")
 	cmd.Dir = dir
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module ftl/depcycle2

		go 1.22.2

		replace github.com/TBD54566975/ftl => ./../../../../..
		replace github.com/TBD54566975/ftl => ./../../../..
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module ftl/external

		go 1.22.2

		replace github.com/TBD54566975/ftl => ../../..
		replace github.com/TBD54566975/ftl => ../../../..
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ go 1.22.2

		toolchain go1.22.4

		replace github.com/TBD54566975/ftl => /Users/jonathanj/dev/ftl
		replace github.com/TBD54566975/ftl => ../../../..