From b99b1adb007949d2c99b56d21522e294055e400a Mon Sep 17 00:00:00 2001 From: Siddharth Kothari Date: Wed, 8 Apr 2020 13:31:59 +0530 Subject: [PATCH] chore: remove neo4j adaptor to simplify builds --- .travis.yml | 29 +++-------------------------- Dockerfile | 7 +------ PrivateDockerfile | 7 +------ build.sh | 2 +- cmd/abc/appbase_version.go | 2 +- 5 files changed, 7 insertions(+), 40 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45e504c7..acb7f0dd 100755 --- a/.travis.yml +++ b/.travis.yml @@ -18,17 +18,13 @@ jobs: sudo: required before_install: - - wget https://github.com/neo4j-drivers/seabolt/releases/download/v1.7.4/seabolt-1.7.4-Linux-ubuntu-16.04.deb - - sudo dpkg -i seabolt-1.7.4-Linux-ubuntu-16.04.deb - - sudo apt-get install -y libssl-dev build-essential - - go get github.com/neo4j/neo4j-go-driver/neo4j - go get gopkg.in/olivere/elastic.v7 - go get github.com/appbaseio/abc || true - mkdir private - git clone https://$PAT@github.com/appbaseio-confidential/abc-import private script: - - go build -tags 'seabolt_static !oss' -o "abc-linux" ./cmd/abc/... + - go build -tags '!oss' -o "abc-linux" ./cmd/abc/... before_deploy: - zip -r abc-linux.zip abc-linux @@ -48,18 +44,13 @@ jobs: osx_image: xcode9.4 before_install: - - curl -LO https://github.com/neo4j-drivers/seabolt/releases/download/v1.7.4/seabolt-1.7.4-Darwin.tar.gz - - tar -zxf seabolt-1.7.4-Darwin.tar.gz - - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/seabolt-1.7.4-Darwin/usr/local/share/pkgconfig - - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/seabolt-1.7.4-Darwin/usr/local/lib - - go get github.com/neo4j/neo4j-go-driver/neo4j - go get gopkg.in/olivere/elastic.v7 - go get github.com/appbaseio/abc || true - mkdir private - git clone https://$PAT@github.com/appbaseio-confidential/abc-import private script: - - go build -tags 'seabolt_static !oss' -o "abc-darwin" ./cmd/abc/... + - go build -tags '!oss' -o "abc-darwin" ./cmd/abc/... before_deploy: - zip -r abc-darwin.zip abc-darwin @@ -78,27 +69,13 @@ jobs: os: windows before_install: - - curl -LO http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/pkg-config_0.26-1_win32.zip - - curl -LO http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.28/glib_2.28.8-1_win32.zip - - curl -LO http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime_0.18.1.1-2_win32.zip - - curl -LO https://github.com/neo4j-drivers/seabolt/releases/download/v1.7.4/seabolt-1.7.4-win64-mingw.zip - - 7z x -opkg-config pkg-config_0.26-1_win32.zip - - 7z x -oglib glib_2.28.8-1_win32.zip - - 7z x -ogettext gettext-runtime_0.18.1.1-2_win32.zip - - choco install pkgconfiglite -y - - 7z x -oC:/ProgramData/chocolatey/lib/pkgconfiglite/tools/pkg-config-lite-0.28-1/share/pkgconfig seabolt-1.7.4-win64-mingw.zip - - 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/ - - 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 - - export CPATH=C:/ProgramData/chocolatey/lib/pkgconfiglite/tools/pkg-config-lite-0.28-1/share/pkgconfig/include/seabolt17 - - export C_INCLUDE_PATH=C:/ProgramData/chocolatey/lib/pkgconfiglite/tools/pkg-config-lite-0.28-1/share/pkgconfig/include/seabolt17 - - go get github.com/neo4j/neo4j-go-driver/neo4j - go get gopkg.in/olivere/elastic.v7 - go get github.com/appbaseio/abc || true - mkdir private - git clone https://$PAT@github.com/appbaseio-confidential/abc-import private script: - - go build -tags 'seabolt_static !oss' -o "abc-windows" ./cmd/abc/... + - go build -tags '!oss' -o "abc-windows" ./cmd/abc/... before_deploy: - 7z a abc-windows.zip abc-windows diff --git a/Dockerfile b/Dockerfile index 09ac56b4..168bd46e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,18 +17,13 @@ ENV ABC_BUILD=${ABC_BUILD} RUN apt-get update && \ apt-get install -y libssl-dev && \ - mkdir -p $GOPATH/github.com/src/appbaseio/abc && \ - mkdir -p /abc && \ - curl -LO https://github.com/neo4j-drivers/seabolt/releases/download/v1.7.4/seabolt-1.7.4-Linux-ubuntu-18.04.deb && \ - dpkg -i seabolt-1.7.4-Linux-ubuntu-18.04.deb && \ - go get github.com/neo4j/neo4j-go-driver/neo4j && \ go get gopkg.in/olivere/elastic.v7 WORKDIR $GOPATH/src/github.com/appbaseio/abc COPY . . -RUN go build -tags "seabolt_static $ABC_BUILD" -o /abc/abc ./cmd/abc/... +RUN go build -tags "$ABC_BUILD" -o /abc/abc ./cmd/abc/... FROM ubuntu:bionic MAINTAINER Siddharth Kothari diff --git a/PrivateDockerfile b/PrivateDockerfile index 35de3352..295c2e22 100644 --- a/PrivateDockerfile +++ b/PrivateDockerfile @@ -20,11 +20,6 @@ ENV PAT=${PAT} RUN apt-get update && \ apt-get install -y libssl-dev && \ - mkdir -p $GOPATH/github.com/src/appbaseio/abc && \ - mkdir -p /abc && \ - curl -LO https://github.com/neo4j-drivers/seabolt/releases/download/v1.7.4/seabolt-1.7.4-Linux-ubuntu-18.04.deb && \ - dpkg -i seabolt-1.7.4-Linux-ubuntu-18.04.deb && \ - go get github.com/neo4j/neo4j-go-driver/neo4j && \ go get gopkg.in/olivere/elastic.v7 WORKDIR $GOPATH/src/github.com/appbaseio/abc @@ -32,7 +27,7 @@ RUN git clone https://$PAT@github.com/appbaseio-confidential/abc-import private COPY . . -RUN go build -tags "seabolt_static $ABC_BUILD" -o /abc/abc ./cmd/abc/... +RUN go build -tags "$ABC_BUILD" -o /abc/abc ./cmd/abc/... FROM ubuntu:bionic MAINTAINER Siddharth Kothari diff --git a/build.sh b/build.sh index 0101ddd8..2afa88af 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ # https://golang.org/doc/install/source#environment mkdir -p build && cd build -VERSION=0.11.0 +VERSION=1.0.0-alpha.6 export GOARCH=amd64 diff --git a/cmd/abc/appbase_version.go b/cmd/abc/appbase_version.go index e228a7da..0b0c99e5 100644 --- a/cmd/abc/appbase_version.go +++ b/cmd/abc/appbase_version.go @@ -7,7 +7,7 @@ import ( "github.com/appbaseio/abc/imports" ) -var version = "1.0.0-alpha.5" +var version = "1.0.0-alpha.6" var variant = imports.BuildName // runVersion runs the logout command