Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bulk library version update #3362

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions actor/sharedaction/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -438,10 +438,10 @@ func (Actor) generateArchiveCFIgnoreMatcher(files []*zip.File) (*ignore.GitIgnor
return nil, err
}
s := append(DefaultIgnoreLines, strings.Split(string(raw), "\n")...)
return ignore.CompileIgnoreLines(s...)
return ignore.CompileIgnoreLines(s...), nil
}
}
return ignore.CompileIgnoreLines(DefaultIgnoreLines...)
return ignore.CompileIgnoreLines(DefaultIgnoreLines...), nil
}

func (actor Actor) generateDirectoryCFIgnoreMatcher(sourceDir string) (*ignore.GitIgnore, error) {
Expand All @@ -466,7 +466,7 @@ func (actor Actor) generateDirectoryCFIgnoreMatcher(sourceDir string) (*ignore.G
if _, err := os.Stat(pathToCFIgnore); !os.IsNotExist(err) {
return ignore.CompileIgnoreFileAndLines(pathToCFIgnore, additionalIgnoreLines...)
}
return ignore.CompileIgnoreLines(additionalIgnoreLines...)
return ignore.CompileIgnoreLines(additionalIgnoreLines...), nil
}

func (Actor) findInResources(path string, filesToInclude []Resource) (Resource, bool) {
Expand Down
40 changes: 21 additions & 19 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ go 1.23.1
require (
code.cloudfoundry.org/bytefmt v0.25.0
code.cloudfoundry.org/cfnetworking-cli-api v0.0.0-20190103195135-4b04f26287a6
code.cloudfoundry.org/cli-plugin-repo v0.0.0-20200304195157-af98c4be9b85
code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-81722a1144e4
code.cloudfoundry.org/cli-plugin-repo v0.0.0-20250108022042-d8ac871f14f6
code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20250114205910-0d1cbbc0a312
code.cloudfoundry.org/clock v1.28.0
code.cloudfoundry.org/diego-ssh v0.0.0-20230810200140-af9d79fe9c82
code.cloudfoundry.org/diego-ssh v0.0.0-20241210012033-4d6c6f7c83ad
code.cloudfoundry.org/go-log-cache/v2 v2.0.7
code.cloudfoundry.org/go-loggregator/v9 v9.2.1
code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f
Expand All @@ -34,11 +34,11 @@ require (
github.com/onsi/ginkgo/v2 v2.22.2
github.com/onsi/gomega v1.36.2
github.com/pkg/errors v0.9.1
github.com/sabhiram/go-gitignore v0.0.0-20171017070213-362f9845770f
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
github.com/sajari/fuzzy v1.0.0
github.com/sirupsen/logrus v1.9.3
github.com/tedsuo/rata v1.0.1-0.20170830210128-07d200713958
github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec
github.com/vito/go-interact v1.0.1
golang.org/x/crypto v0.32.0
golang.org/x/net v0.34.0
golang.org/x/term v0.28.0
Expand All @@ -53,42 +53,44 @@ require (
code.cloudfoundry.org/inigo v0.0.0-20230612153013-b300679e6ed6 // indirect
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
github.com/bmatcuk/doublestar v1.3.4 // indirect
github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 // indirect
github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f // indirect
github.com/charlievieth/fs v0.0.3 // indirect
github.com/cloudfoundry/bosh-utils v0.0.397 // indirect
github.com/cppforlife/go-patch v0.1.0 // indirect
github.com/cloudfoundry/bosh-utils v0.0.521 // indirect
github.com/cppforlife/go-patch v0.2.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kr/pty v1.1.8 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.11 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/openzipkin/zipkin-go v0.4.3 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opentelemetry.io/otel v1.33.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.33.0 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/oauth2 v0.25.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.29.0 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.36.1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
google.golang.org/grpc v1.69.4 // indirect
google.golang.org/protobuf v1.36.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
Expand Down
Loading
Loading