Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Godeps, vendor: switch to Go 1.6 vendored dependencies #2512

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
language: go
go:
- 1.4.2
- 1.6.2
install:
# - go get code.google.com/p/go.tools/cmd/goimports
# - go get github.com/golang/lint/golint
# - go get golang.org/x/tools/cmd/vet
# - go get golang.org/x/tools/cmd/vet
- go get golang.org/x/tools/cmd/cover
before_script:
# - gofmt -l -w .
Expand All @@ -24,6 +24,6 @@ notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/e09ccdce1048c5e03445
on_success: change
on_success: change
on_failure: always
on_start: false
on_start: false
2 changes: 1 addition & 1 deletion Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions Godeps/Readme

This file was deleted.

2 changes: 0 additions & 2 deletions Godeps/_workspace/.gitignore

This file was deleted.

6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ evm:
@echo "Run \"$(GOBIN)/evm to start the evm."

all:
build/env.sh go install -v $(shell build/flags.sh) ./...
build/env.sh go install -v $(shell build/flags.sh) `build/env.sh go list ./... | grep -v /vendor/`

test: all
build/env.sh go test ./...
build/env.sh go test `build/env.sh go list ./... | grep -v /vendor/`

travis-test-with-coverage: all
build/env.sh go vet ./...
build/env.sh go vet `build/env.sh go list ./... | grep -v /vendor/`
build/env.sh build/test-global-coverage.sh

xgo:
Expand Down
6 changes: 4 additions & 2 deletions build/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ fi

# Set up the environment to use the workspace.
# Also add Godeps workspace so we build using canned dependencies.
GOPATH="$ethdir/go-ethereum/Godeps/_workspace:$workspace"
GOPATH="$workspace"
GOBIN="$PWD/build/bin"
export GOPATH GOBIN
GO15VENDOREXPERIMENT=1

export GOPATH GOBIN GO15VENDOREXPERIMENT

# Run the command inside the workspace.
cd "$ethdir/go-ethereum"
Expand Down
2 changes: 1 addition & 1 deletion build/test-global-coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e
echo "" > coverage.txt

for d in $(find ./* -maxdepth 10 -type d -not -path "./build" -not -path "./Godeps/*" ); do
for d in $(find ./* -maxdepth 10 -type d -not -path "./build" -not -path "./vendor/*" ); do
if ls $d/*.go &> /dev/null; then
go test -coverprofile=profile.out -covermode=atomic $d
if [ -f profile.out ]; then
Expand Down
2 changes: 1 addition & 1 deletion node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func (n *Node) Start() error {
}
// Otherwise copy and specialize the P2P configuration
running := new(p2p.Server)
*running = *n.serverConfig
reflect.ValueOf(running).Elem().Set(reflect.ValueOf(n.serverConfig).Elem()) // Fancy *running = *n.serverConfig to prevent mutex copy
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

??

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand the intention to fix the go vet issue but this is not a good fix for it.
We need to find another way. I can remove the mutex as a quick workaround.


services := make(map[reflect.Type]Service)
for _, constructor := range n.serviceFuncs {
Expand Down
Loading