Merge branch 'master' into next

This commit is contained in:
Jeffrey Paul 2018-11-01 08:11:41 -07:00
commit ff9b67f543
Signed by: sneak
GPG Key ID: 052443F4DF2A55C2
3 changed files with 32 additions and 1 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
steem-block-db

30
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,30 @@
image: golang:1.11
cache:
paths:
- /apt-cache
- /go/src/github.com
- /go/src/golang.org
- /go/src/google.golang.org
- /go/src/gopkg.in
stages:
- test
- build
before_script:
- mkdir /go/src/steem-block-db
- cp $CI_PROJECT_DIR/*.go /go/src/steem-block-db
- cd /go/src/steem-block-db
- GOPATH=/go go get
#unit_tests:
# stage: test
# script:
# - make test
build:
stage: build
script:
- cd /go/src/steem-block-db
- GOPATH=/go go build

View File

@ -115,7 +115,7 @@ func (kv *BadgerKVStore) Put(key *string, value *string) error {
if err != nil {
log.Fatal(err)
}
err = txn.Commit(nil)
err = txn.Commit()
if err != nil {
log.Fatal(err)
}