fix: use git ls-files -z (#781)

Also bump version in go.mod/go.work files and templates. Need a more permanent fix for this.
block · Jan 15, 2024 · d73eaa1 · d73eaa1
1 parent 991d0df
commit d73eaa1
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -137,7 +137,7 @@ jobs:
         run: bit frontend/dist/index.html
       - name: Publish Go Binaries
         run: |
-          git ls-files -- '*.go' | xargs errtrace -w && go mod tidy
+          git ls-files -z -- '*.go' | xargs -0 errtrace -w && go mod tidy
           bit build/release/ftl
           goreleaser release --skip=validate
         env:

diff --git a/Dockerfile.controller b/Dockerfile.controller
@@ -19,7 +19,7 @@ RUN go mod download -x
 
 # Build
 COPY . /src/
-RUN git ls-files -- '*.go' | xargs errtrace -w && go mod tidy
+RUN git ls-files -z -- '*.go' | xargs -0 errtrace -w && go mod tidy
 RUN bit build/release/ftl-controller
 RUN bit build/release/ftl-initdb
 RUN bit build/release/ftl

diff --git a/Dockerfile.runner b/Dockerfile.runner
@@ -26,7 +26,7 @@ COPY . /src/
 RUN bit build/template/ftl/jars/ftl-runtime.jar
 
 # Build runner
-RUN git ls-files -- '*.go' | xargs errtrace -w && go mod tidy
+RUN git ls-files -z -- '*.go' | xargs -0 errtrace -w && go mod tidy
 RUN bit build/release/ftl-runner
 RUN bit build/release/ftl
 

diff --git a/bin/.staticcheck-2023.1.6.pkg b/bin/.staticcheck-2023.1.6.pkg
@@ -0,0 +1 @@
+hermit
diff --git a/bin/staticcheck b/bin/staticcheck
@@ -0,0 +1 @@
+.staticcheck-2023.1.6.pkg
diff --git a/examples/echo/go.mod b/examples/echo/go.mod
@@ -1,6 +1,6 @@
 module ftl/echo
 
-go 1.21.5
+go 1.21.6
 
 require github.com/TBD54566975/ftl v0.95.0
 

diff --git a/examples/online-boutique/go.mod b/examples/online-boutique/go.mod
@@ -1,5 +1,5 @@
 module github.com/TBD54566975/ftl/examples/online-boutique
 
-go 1.21.5
+go 1.21.6
 
 replace github.com/TBD54566975/ftl => ../..
diff --git a/examples/online-boutique/services/ad/go.mod b/examples/online-boutique/services/ad/go.mod
@@ -1,6 +1,6 @@
 module ftl/ad
 
-go 1.21.5
+go 1.21.6
 
 replace github.com/TBD54566975/ftl => ../../../..
 

diff --git a/examples/online-boutique/services/cart/go.mod b/examples/online-boutique/services/cart/go.mod
@@ -1,6 +1,6 @@
 module ftl/cart
 
-go 1.21.5
+go 1.21.6
 
 replace github.com/TBD54566975/ftl => ../../../..
 

diff --git a/examples/online-boutique/services/currency/go.mod b/examples/online-boutique/services/currency/go.mod
@@ -1,6 +1,6 @@
 module ftl/currency
 
-go 1.21.5
+go 1.21.6
 
 replace github.com/TBD54566975/ftl => ../../../..
 

diff --git a/examples/online-boutique/services/payment/go.mod b/examples/online-boutique/services/payment/go.mod
@@ -1,6 +1,6 @@
 module ftl/payment
 
-go 1.21.5
+go 1.21.6
 
 replace github.com/TBD54566975/ftl => ../../../..
 

diff --git a/examples/online-boutique/services/productcatalog/go.mod b/examples/online-boutique/services/productcatalog/go.mod
@@ -1,6 +1,6 @@
 module ftl/productcatalog
 
-go 1.21.5
+go 1.21.6
 
 replace github.com/TBD54566975/ftl => ../../../..
 

diff --git a/examples/online-boutique/services/shipping/go.mod b/examples/online-boutique/services/shipping/go.mod
@@ -1,6 +1,6 @@
 module ftl/shipping
 
-go 1.21.5
+go 1.21.6
 
 replace github.com/TBD54566975/ftl => ../../../..
 

diff --git a/examples/time/go.mod b/examples/time/go.mod
@@ -1,3 +1,3 @@
 module ftl/time
 
-go 1.21.5
+go 1.21.6
diff --git a/frontend/src/protos/opentelemetry/proto/collector/metrics/v1/metrics_service_connect.ts b/frontend/src/protos/opentelemetry/proto/collector/metrics/v1/metrics_service_connect.ts
diff --git a/go-runtime/compile/external-module-template/_ftl/go/modules/go.mod.tmpl b/go-runtime/compile/external-module-template/_ftl/go/modules/go.mod.tmpl
@@ -1,3 +1,3 @@
 module ftl
 
-go 1.21.5
+go 1.21.6
diff --git a/go-runtime/scaffolding/{{ .Name | camel | lower }}/go.mod.tmpl b/go-runtime/scaffolding/{{ .Name | camel | lower }}/go.mod.tmpl
@@ -1,5 +1,5 @@
 module ftl/{{ .Name }}
 
-go 1.21.5
+go 1.21.6
 
 require github.com/TBD54566975/ftl latest
diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -34,7 +34,6 @@ import (
 const integrationTestTimeout = time.Second * 60
 
 func TestIntegration(t *testing.T) {
-	t.Skip()
 	tmpDir := t.TempDir()
 
 	cwd, err := os.Getwd()