Skip to content

Commit b99b1ad

Browse files
chore: remove neo4j adaptor to simplify builds
1 parent 24dd713 commit b99b1ad

File tree

5 files changed

+7
-40
lines changed

5 files changed

+7
-40
lines changed

.travis.yml

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,13 @@ jobs:
1818
sudo: required
1919

2020
before_install:
21-
- wget https://github.com/neo4j-drivers/seabolt/releases/download/v1.7.4/seabolt-1.7.4-Linux-ubuntu-16.04.deb
22-
- sudo dpkg -i seabolt-1.7.4-Linux-ubuntu-16.04.deb
23-
- sudo apt-get install -y libssl-dev build-essential
24-
- go get github.com/neo4j/neo4j-go-driver/neo4j
2521
- go get gopkg.in/olivere/elastic.v7
2622
- go get github.com/appbaseio/abc || true
2723
- mkdir private
2824
- git clone https://[email protected]/appbaseio-confidential/abc-import private
2925

3026
script:
31-
- go build -tags 'seabolt_static !oss' -o "abc-linux" ./cmd/abc/...
27+
- go build -tags '!oss' -o "abc-linux" ./cmd/abc/...
3228

3329
before_deploy:
3430
- zip -r abc-linux.zip abc-linux
@@ -48,18 +44,13 @@ jobs:
4844
osx_image: xcode9.4
4945

5046
before_install:
51-
- curl -LO https://github.com/neo4j-drivers/seabolt/releases/download/v1.7.4/seabolt-1.7.4-Darwin.tar.gz
52-
- tar -zxf seabolt-1.7.4-Darwin.tar.gz
53-
- export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/seabolt-1.7.4-Darwin/usr/local/share/pkgconfig
54-
- export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/seabolt-1.7.4-Darwin/usr/local/lib
55-
- go get github.com/neo4j/neo4j-go-driver/neo4j
5647
- go get gopkg.in/olivere/elastic.v7
5748
- go get github.com/appbaseio/abc || true
5849
- mkdir private
5950
- git clone https://[email protected]/appbaseio-confidential/abc-import private
6051

6152
script:
62-
- go build -tags 'seabolt_static !oss' -o "abc-darwin" ./cmd/abc/...
53+
- go build -tags '!oss' -o "abc-darwin" ./cmd/abc/...
6354

6455
before_deploy:
6556
- zip -r abc-darwin.zip abc-darwin
@@ -78,27 +69,13 @@ jobs:
7869
os: windows
7970

8071
before_install:
81-
- curl -LO http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/pkg-config_0.26-1_win32.zip
82-
- curl -LO http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.28/glib_2.28.8-1_win32.zip
83-
- curl -LO http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime_0.18.1.1-2_win32.zip
84-
- curl -LO https://github.com/neo4j-drivers/seabolt/releases/download/v1.7.4/seabolt-1.7.4-win64-mingw.zip
85-
- 7z x -opkg-config pkg-config_0.26-1_win32.zip
86-
- 7z x -oglib glib_2.28.8-1_win32.zip
87-
- 7z x -ogettext gettext-runtime_0.18.1.1-2_win32.zip
88-
- choco install pkgconfiglite -y
89-
- 7z x -oC:/ProgramData/chocolatey/lib/pkgconfiglite/tools/pkg-config-lite-0.28-1/share/pkgconfig seabolt-1.7.4-win64-mingw.zip
90-
- mv C:/ProgramData/chocolatey/lib/pkgconfiglite/tools/pkg-config-lite-0.28-1/share/pkgconfig/seabolt-1.7.4-win64-mingw/* C:/ProgramData/chocolatey/lib/pkgconfiglite/tools/pkg-config-lite-0.28-1/share/pkgconfig/
91-
- export PATH=$PATH:`pwd`/glib/bin:`pwd`/gettext/bin:`pwd`/pkg-config/bin:C:/ProgramData/chocolatey/lib/pkgconfiglite/tools/pkg-config-lite-0.28-1/share/pkgconfig/bin
92-
- export CPATH=C:/ProgramData/chocolatey/lib/pkgconfiglite/tools/pkg-config-lite-0.28-1/share/pkgconfig/include/seabolt17
93-
- export C_INCLUDE_PATH=C:/ProgramData/chocolatey/lib/pkgconfiglite/tools/pkg-config-lite-0.28-1/share/pkgconfig/include/seabolt17
94-
- go get github.com/neo4j/neo4j-go-driver/neo4j
9572
- go get gopkg.in/olivere/elastic.v7
9673
- go get github.com/appbaseio/abc || true
9774
- mkdir private
9875
- git clone https://[email protected]/appbaseio-confidential/abc-import private
9976

10077
script:
101-
- go build -tags 'seabolt_static !oss' -o "abc-windows" ./cmd/abc/...
78+
- go build -tags '!oss' -o "abc-windows" ./cmd/abc/...
10279

10380
before_deploy:
10481
- 7z a abc-windows.zip abc-windows

Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,13 @@ ENV ABC_BUILD=${ABC_BUILD}
1717

1818
RUN apt-get update && \
1919
apt-get install -y libssl-dev && \
20-
mkdir -p $GOPATH/github.com/src/appbaseio/abc && \
21-
mkdir -p /abc && \
22-
curl -LO https://github.com/neo4j-drivers/seabolt/releases/download/v1.7.4/seabolt-1.7.4-Linux-ubuntu-18.04.deb && \
23-
dpkg -i seabolt-1.7.4-Linux-ubuntu-18.04.deb && \
24-
go get github.com/neo4j/neo4j-go-driver/neo4j && \
2520
go get gopkg.in/olivere/elastic.v7
2621

2722
WORKDIR $GOPATH/src/github.com/appbaseio/abc
2823

2924
COPY . .
3025

31-
RUN go build -tags "seabolt_static $ABC_BUILD" -o /abc/abc ./cmd/abc/...
26+
RUN go build -tags "$ABC_BUILD" -o /abc/abc ./cmd/abc/...
3227

3328
FROM ubuntu:bionic
3429
MAINTAINER Siddharth Kothari <[email protected]>

PrivateDockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,14 @@ ENV PAT=${PAT}
2020

2121
RUN apt-get update && \
2222
apt-get install -y libssl-dev && \
23-
mkdir -p $GOPATH/github.com/src/appbaseio/abc && \
24-
mkdir -p /abc && \
25-
curl -LO https://github.com/neo4j-drivers/seabolt/releases/download/v1.7.4/seabolt-1.7.4-Linux-ubuntu-18.04.deb && \
26-
dpkg -i seabolt-1.7.4-Linux-ubuntu-18.04.deb && \
27-
go get github.com/neo4j/neo4j-go-driver/neo4j && \
2823
go get gopkg.in/olivere/elastic.v7
2924

3025
WORKDIR $GOPATH/src/github.com/appbaseio/abc
3126
RUN git clone https://[email protected]/appbaseio-confidential/abc-import private
3227

3328
COPY . .
3429

35-
RUN go build -tags "seabolt_static $ABC_BUILD" -o /abc/abc ./cmd/abc/...
30+
RUN go build -tags "$ABC_BUILD" -o /abc/abc ./cmd/abc/...
3631

3732
FROM ubuntu:bionic
3833
MAINTAINER Siddharth Kothari <[email protected]>

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://golang.org/doc/install/source#environment
33
mkdir -p build && cd build
44

5-
VERSION=0.11.0
5+
VERSION=1.0.0-alpha.6
66

77
export GOARCH=amd64
88

cmd/abc/appbase_version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/appbaseio/abc/imports"
88
)
99

10-
var version = "1.0.0-alpha.5"
10+
var version = "1.0.0-alpha.6"
1111
var variant = imports.BuildName
1212

1313
// runVersion runs the logout command

0 commit comments

Comments
 (0)