Skip to content

Commit

Permalink
fix: build error
Browse files Browse the repository at this point in the history
  • Loading branch information
@dosco
dosco committed Jan 27, 2023
1 parent 357767e commit 13448e4
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 37 deletions.
9 changes: 3 additions & 6 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,9 @@ tidy:
@go mod tidy -go=1.16 && go mod tidy -go=1.17

test:
@go test -v $(PACKAGES)
@go test -v -timeout 30m -race ./tests/...
@go test -v -timeout 30m -race -db=mysql -tags=mysql ./tests/...

test-norace:
@go test -v -timeout 50m ./... && go test -v -timeout 50m -db=mysql -tags=mysql ./...
@go test -v -race $(PACKAGES)
@cd tests; go test -v -timeout 30m -race .
@cd tests; go test -v -timeout 30m -race -db=mysql -tags=mysql .

BIN_DIR := $(GOPATH)/bin
WEB_BUILD_DIR := ./serv/web/build/manifest.json
Expand Down
2 changes: 1 addition & 1 deletion conf/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/dosco/graphjin/core/v3"
"github.com/dosco/graphjin/plugin/osfs/v3"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type configInfo struct {
Expand Down
11 changes: 4 additions & 7 deletions conf/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
module github.com/dosco/graphjin/conf/v3

go 1.19
go 1.18

require (
github.com/dosco/graphjin/core/v3 v3.0.0-20230125194335-99d5bba0367c
gopkg.in/yaml.v2 v2.4.0
github.com/dosco/graphjin/core/v3 v3.0.0-20230127063635-357767ee278d
github.com/dosco/graphjin/plugin/osfs/v3 v3.0.0-20230125094531-96f5ec6d2d29
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/dosco/graphjin/plugin/osfs/v3 v3.0.0-20230125094531-96f5ec6d2d29 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/kr/text v0.2.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/text v0.6.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
18 changes: 3 additions & 15 deletions conf/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,12 @@
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/dosco/graphjin/core/v3 v3.0.0-20230125194335-99d5bba0367c h1:tF3yd5x69E7sdV609LSEv6rQHpzJQ0Y240JoIIwtADE=
github.com/dosco/graphjin/core/v3 v3.0.0-20230125194335-99d5bba0367c/go.mod h1:m9qyG6Y5a2TrAihro/HOncBbhgogURU4VuBsAZvyaMY=
github.com/dosco/graphjin/core/v3 v3.0.0-20230127063635-357767ee278d h1:nlQgn6S3i/gYIUQ5f/MzymWuxrXMnCe3qhkSYdGijFo=
github.com/dosco/graphjin/core/v3 v3.0.0-20230127063635-357767ee278d/go.mod h1:JNJBiJJCh9VzcEr8tx8yN2BddDvxCBrk8S4bO6dcw5U=
github.com/dosco/graphjin/plugin/osfs/v3 v3.0.0-20230125094531-96f5ec6d2d29 h1:Ctl/1wccrwLRXwnShEeG3KwexhFRJMx5L11ltwjlbiU=
github.com/dosco/graphjin/plugin/osfs/v3 v3.0.0-20230125094531-96f5ec6d2d29/go.mod h1:lg2ZkWi2PmA8d8t0vL7fgyFc1bKAkSIb6sWnOWmaseQ=
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2 changes: 2 additions & 0 deletions go.work.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3v
github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0=
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 h1:49lOXmGaUpV9Fz3gd7TFZY106KVlPVa5jcYD1gaQf98=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pkg/sftp v1.13.1 h1:I2qBYMChEhIjOgazfJmV3/mZM256btk6wkCDRmW7JYs=
github.com/posener/complete v1.1.1 h1:ccV59UEOTzVDnDUEFdT95ZzHVZ+5+158q8+SJb2QV5w=
github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
Expand All @@ -404,6 +405,7 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/ryanuber/columnize v2.1.0+incompatible h1:j1Wcmh8OrK4Q7GXY+V7SVSY8nUWQxHW5TkBe7YUl+2s=
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphjin",
"version": "3.0.5",
"version": "3.0.7",
"description": "GraphJin - Build APIs in 5 minutes with GraphQL",
"type": "module",
"main": "./wasm/js/graphjin.js",
Expand Down
6 changes: 2 additions & 4 deletions plugin/otel/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
module github.com/dosco/graphjin/plugin/otel/v3

go 1.19

replace github.com/dosco/graphjin/core/v3 => ../../core
go 1.18

require (
github.com/dosco/graphjin/core/v3 v3.0.0-00010101000000-000000000000
github.com/dosco/graphjin/core/v3 v3.0.0-20230127063635-357767ee278d
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0
go.opentelemetry.io/otel v1.11.2
go.opentelemetry.io/otel/trace v1.11.2
Expand Down
2 changes: 2 additions & 0 deletions plugin/otel/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/dosco/graphjin/core/v3 v3.0.0-20230127063635-357767ee278d h1:nlQgn6S3i/gYIUQ5f/MzymWuxrXMnCe3qhkSYdGijFo=
github.com/dosco/graphjin/core/v3 v3.0.0-20230127063635-357767ee278d/go.mod h1:JNJBiJJCh9VzcEr8tx8yN2BddDvxCBrk8S4bO6dcw5U=
github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
Expand Down
3 changes: 0 additions & 3 deletions serv/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module github.com/dosco/graphjin/serv/v3

go 1.18

replace ithub.com/dosco/graphjin/core/v3 => ../core
replace ithub.com/dosco/graphjin/plugin/otel/v3 => ../plugin/otel

require (
github.com/dosco/graphjin/core/v3 v3.0.0-20230126190039-60bf6b5d3fd3
github.com/dosco/graphjin/plugin/afero/v3 v3.0.0-20230125090031-062b181a2f0f
Expand Down
Binary file modified wasm/graphjin.wasm
View file
Binary file not shown.

1 comment on commit 13448e4

@vercel
Copy link

@vercel vercel bot commented on 13448e4 Jan 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

graphjin – ./

www.graphjin.com
graphjin.vercel.app
graphjin-dosco.vercel.app
graphjin.com
graphjin-git-master-dosco.vercel.app

Please sign in to comment.