benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #37 from anytypeio/fix-graphviz-nocgo

Browse Source 
exclude graphviz when CGO_ENABLED=0
This commit is contained in:
Roman Khafizianov 2023-03-01 15:13:01 +01:00 committed by GitHub
commit 6c17d380b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph.go
View File

@ -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

8
commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go
View File

@ -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"
)

4
commonspace/object/tree/objecttree/treegraph.go
View File

@ -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

8
commonspace/object/tree/objecttree/treegraph_nix.go
View File

@ -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) {