From b2b45e0f2f9603777dce2d8603859549012068e9 Mon Sep 17 00:00:00 2001 From: Roman Khafizianov Date: Tue, 28 Feb 2023 17:03:19 +0100 Subject: [PATCH] exclude graphviz when CGO_ENABLED=0 --- .../testutils/acllistbuilder/liststoragebuildergraph.go | 4 ++-- .../acllistbuilder/liststoragebuildergraph_nix.go | 8 +++++--- commonspace/object/tree/objecttree/treegraph.go | 4 ++-- commonspace/object/tree/objecttree/treegraph_nix.go | 8 +++++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph.go b/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph.go index 75b72f3b..3752b660 100644 --- a/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph.go +++ b/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph.go @@ -1,5 +1,5 @@ -//go:build ((!linux && !darwin) || android || ios || nographviz) && !amd64 -// +build !linux,!darwin android ios nographviz +//go:build ((!linux && !darwin) || android || ios || nographviz || !cgo) && !amd64 +// +build !linux,!darwin android ios nographviz !cgo // +build !amd64 package acllistbuilder diff --git a/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go b/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go index 279744c8..a1d2ed8f 100644 --- a/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go +++ b/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go @@ -1,19 +1,21 @@ -//go:build (linux || darwin) && !android && !ios && !nographviz && (amd64 || arm64) +//go:build (linux || darwin) && !android && !ios && !nographviz && cgo && (amd64 || arm64) // +build linux darwin // +build !android // +build !ios // +build !nographviz +// +build cgo // +build amd64 arm64 package acllistbuilder import ( "fmt" - "github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto" - "github.com/gogo/protobuf/proto" "strings" "unicode" + "github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto" + "github.com/gogo/protobuf/proto" + "github.com/awalterschulze/gographviz" ) diff --git a/commonspace/object/tree/objecttree/treegraph.go b/commonspace/object/tree/objecttree/treegraph.go index 722ef975..75952232 100644 --- a/commonspace/object/tree/objecttree/treegraph.go +++ b/commonspace/object/tree/objecttree/treegraph.go @@ -1,5 +1,5 @@ -//go:build (!linux && !darwin) || android || ios || nographviz || windows -// +build !linux,!darwin android ios nographviz windows +//go:build (!linux && !darwin) || android || ios || nographviz || !cgo || windows +// +build !linux,!darwin android ios nographviz !cgo windows package objecttree diff --git a/commonspace/object/tree/objecttree/treegraph_nix.go b/commonspace/object/tree/objecttree/treegraph_nix.go index d8e104cf..c1925a9b 100644 --- a/commonspace/object/tree/objecttree/treegraph_nix.go +++ b/commonspace/object/tree/objecttree/treegraph_nix.go @@ -1,8 +1,9 @@ -//go:build (linux || darwin) && !android && !ios && !nographviz && (amd64 || arm64) +//go:build (linux || darwin) && !android && !ios && !nographviz && cgo && (amd64 || arm64) // +build linux darwin // +build !android // +build !ios // +build !nographviz +// +build cgo // +build amd64 arm64 package objecttree @@ -10,10 +11,11 @@ package objecttree import ( "bytes" "fmt" - "github.com/goccy/go-graphviz" - "github.com/goccy/go-graphviz/cgraph" "strings" "time" + + "github.com/goccy/go-graphviz" + "github.com/goccy/go-graphviz/cgraph" ) func (t *Tree) Graph(parser DescriptionParser) (data string, err error) {