Skip to content

Commit

Permalink
Merge branch 'development' into pre-release
Browse files Browse the repository at this point in the history
* development: (77 commits)
  Fix imports.
  Remove unused gx code.
  Delete unused code.
  Purge unused packages.
  Add missing gx packages.
  Handle error when calculating SHA peer id
  [OpenBazaar#1645] Prevent notifications produced on MODERATOR_ADD and REMOVE
  Bump version to 0.13.4
  [OpenBazaar#1626] Fix secio handshake to properly fallback to alt ID generation
  [OpenBazaar#1634] Apply patch from go-libp2p-secio v0.0.3 release
  [OpenBazaar#1593] Add Start subcommand option to force key purge from IPNS cache
  Use separate namespace for IPNS persistent cache
  Best effort delete ipns record if unmarshaling fails
  Don't cache records for our own peerID
  Add validator in mobile package
  Add record validator to APIRouter
  [OpenBazaar#1557] Make CachingRouter implement routing.PubKeyFetcher
  [OpenBazaar#1557] CachingRouter network lookup fixes
  Cleanup function naming, lint failures
  Update mobile/node to use extracted config methods
  ...
  • Loading branch information
anchaj committed Aug 8, 2019
2 parents 1cc7de6 + 2e0da37 commit c8fee82
Show file tree
Hide file tree
Showing 2,965 changed files with 96,026 additions and 776,490 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ linters:
- goconst
- govet
- megacheck
- goimports
disable:
- goimports
- errcheck
- golint
- prealloc
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
language: go
go:
- "1.10.3"
- "1.11"
sudo: required
services:
- docker
env:
- "PATH=/home/travis/gopath/bin:$PATH"
before_install:
- go get -u github.com/axw/gocov/gocov github.com/mattn/goveralls github.com/tcnksm/ghr
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.10
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.15.0
install:
- echo "No external dependencies required. Skipping travis default library dependency setup to use vendors..."
script:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM golang:1.10
WORKDIR /go/src/github.com/phoreproject/openbazaar-go
FROM golang:1.11
WORKDIR /go/src/github.com/OpenBazaar/openbazaar-go
COPY . .
RUN go build --ldflags '-extldflags "-static"' -o /opt/openbazaard .

Expand Down
7 changes: 4 additions & 3 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.10
FROM golang:1.11
VOLUME /var/lib/openbazaar

RUN wget https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tgz && \
Expand Down Expand Up @@ -28,9 +28,10 @@ WORKDIR /go/src/github.com/phoreproject/openbazaar-go
RUN go get -u github.com/gogo/protobuf/proto \
github.com/golang/protobuf/protoc-gen-go \
github.com/icrowley/fake \
github.com/derekparker/delve/cmd/dlv
github.com/derekparker/delve/cmd/dlv \
github.com/tools/godep

RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.10
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.15.0

WORKDIR /go/src/github.com/phoreproject/openbazaar-go

Expand Down
Loading

0 comments on commit c8fee82

Please sign in to comment.