Skip to content

Commit 1e3f9a6

Browse files
authored
Merge pull request #475 from erizocosmico/revert/oniguruma
remove oniguruma support from prebuilt binaries
2 parents 9163d88 + 92416ab commit 1e3f9a6

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ before_install:
1919
- docker pull pilosa/pilosa:v1.1.0
2020
- docker run -d --name pilosa -p 127.0.0.1:10101:10101 pilosa/pilosa:v1.1.0
2121
- docker ps -a
22-
- sudo apt-get install -y libonig2 libonig-dev
2322
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90
2423
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 90
2524

@@ -68,7 +67,6 @@ jobs:
6867

6968
script:
7069
- brew update
71-
- brew install oniguruma
7270
- make packages || echo "" # will fail because of docker being missing
7371
- if [ ! -f "build/gitbase_darwin_amd64/gitbase" ]; then echo "gitbase binary not generated" && exit 1; fi
7472
- cd build

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Package configuration
22
PROJECT = gitbase
33
COMMANDS = cmd/gitbase
4-
GO_TAGS = oniguruma
54

65
# Including ci Makefile
76
CI_REPOSITORY ?= https://github.com/src-d/ci.git

docs/using-gitbase/getting-started.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ Then build gitbase like this:
7979
go build -tags oniguruma -o gitbase ./cmd/gitbase/main.go
8080
```
8181

82+
**Note:** prebuilt binaries do not include oniguruma support.
83+
8284
On Windows:
8385

8486
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:

0 commit comments

Comments
 (0)