Skip to content

Commit fb1d5fe

Browse files
committed
gitbase: remove make dependencies step
Signed-off-by: Miguel Molina <[email protected]>
1 parent 94d169f commit fb1d5fe

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ before_install:
2222
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90
2323
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 90
2424

25-
install:
26-
- cd ./vendor/gopkg.in/bblfsh/client-go.v2
27-
- make dependencies
28-
- cd ./../../../..
29-
- make dependencies
30-
3125
before_script:
3226
- docker run -d --name bblfshd --privileged -p 9432:9432 -v /var/lib/bblfshd:/var/lib/bblfshd bblfsh/bblfshd
3327
- docker exec -it bblfshd bblfshctl driver install python bblfsh/python-driver

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ $(MAKEFILE):
1313

1414
-include $(MAKEFILE)
1515

16+
# we still need to do this for windows
1617
bblfsh-client:
1718
cd vendor/gopkg.in/bblfsh/client-go.v2 && make dependencies
1819

19-
dependencies: bblfsh-client
20+
dependencies: bblfsh-client

docs/using-gitbase/getting-started.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,15 @@ $ gitbase server -v -g /path/to/repositories
2121

2222
## Installing from source
2323

24-
Because gitbase uses [bblfsh's client-go](https://github.com/bblfsh/client-go), which uses cgo, you need to install some dependencies by hand instead of just using `go get`.
24+
On Linux and macOS:
2525

26-
**Note**: we use `go get -d` so the code is not compiled yet, as it would
27-
fail before `make dependencies` is executed successfully.
26+
```
27+
go get -u github.com/src-d/gitbase/...
28+
```
29+
30+
On Windows:
31+
32+
Because gitbase uses [bblfsh's client-go](https://github.com/bblfsh/client-go), which uses cgo, you need to install some dependencies by hand instead of just using `go get`. Use this instead:
2833

2934
```
3035
$ go get -d github.com/src-d/gitbase

internal/function/uast.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func (f UAST) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
197197

198198
resp, err := client.Parse(ctx, lang, bytes)
199199
if err != nil {
200-
return nil, err
200+
return nil, ErrParseBlob.New(err)
201201
}
202202

203203
if resp.Status != protocol.Ok {

0 commit comments

Comments
 (0)