JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add make install-sdk target (#1069)

Browse Source
This commit is contained in:
Egon Elbre 2019-01-16 13:50:16 -05:00 committed by GitHub
parent b3713b7d92
commit b86c4dc5eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -72,7 +72,7 @@ matrix:
- source scripts/install-awscli.sh - source scripts/install-awscli.sh
- go install -race storj.io/storj/cmd/{storj-sdk,bootstrap,satellite,storagenode,uplink,gateway,certificates,captplanet} - go install -race storj.io/storj/cmd/{storj-sdk,bootstrap,satellite,storagenode,uplink,gateway,certificates,captplanet}
script: script:
- set -o pipefail && make test-storj-sdk |& go run scripts/fail-on-race.go - set -o pipefail && make test-sdk |& go run scripts/fail-on-race.go
- set -o pipefail && make test-certificate-signing |& go run scripts/fail-on-race.go - set -o pipefail && make test-certificate-signing |& go run scripts/fail-on-race.go
- set -o pipefail && make test-captplanet |& go run scripts/fail-on-race.go - set -o pipefail && make test-captplanet |& go run scripts/fail-on-race.go

13
Makefile
View File

@ -65,6 +65,13 @@ proto: ## Rebuild protobuf files
go run scripts/protobuf.go install go run scripts/protobuf.go install
go run scripts/protobuf.go generate go run scripts/protobuf.go generate
##@ SDK
.PHONY: install-sdk
install-sdk: ## install storj-sdk
@echo "Running ${@}"
@go install -race -v storj.io/storj/cmd/storj-sdk storj.io/storj/cmd/bootstrap storj.io/storj/cmd/satellite storj.io/storj/cmd/storagenode storj.io/storj/cmd/uplink storj.io/storj/cmd/gateway
##@ Test ##@ Test
.PHONY: test .PHONY: test
@ -77,10 +84,10 @@ test-captplanet: ## Test source with captain planet (travis)
@echo "Running ${@}" @echo "Running ${@}"
@./scripts/test-captplanet.sh @./scripts/test-captplanet.sh
.PHONY: test-storj-sdk .PHONY: test-sdk
test-storj-sdk: ## Test source with storj-sdk (travis) test-sdk: ## Test source with storj-sdk (travis)
@echo "Running ${@}" @echo "Running ${@}"
@./scripts/test-storj-sdk.sh @./scripts/test-sdk.sh
.PHONY: test-certificate-signing .PHONY: test-certificate-signing
test-certificate-signing: ## Test certificate signing service and storagenode setup (travis) test-certificate-signing: ## Test certificate signing service and storagenode setup (travis)

0
scripts/test-storj-sdk-aws.sh → scripts/test-sdk-aws.sh
View File

4
scripts/test-storj-sdk.sh → scripts/test-sdk.sh
View File

@ -3,7 +3,7 @@ set -ueo pipefail
SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
go install -race -v storj.io/storj/cmd/{storj-sdk,bootstrap,satellite,storagenode,uplink,gateway} make -C $SCRIPTDIR/.. install-sdk
# setup tmpdir for testfiles and cleanup # setup tmpdir for testfiles and cleanup
TMP=$(mktemp -d -t tmp.XXXXXXXXXX) TMP=$(mktemp -d -t tmp.XXXXXXXXXX)
@ -18,7 +18,7 @@ export STORJ_LOCAL_NETWORK=$TMP
storj-sdk -x network setup storj-sdk -x network setup
# run aws-cli tests # run aws-cli tests
storj-sdk -x network test bash $SCRIPTDIR/test-storj-sdk-aws.sh storj-sdk -x network test bash $SCRIPTDIR/test-sdk-aws.sh
storj-sdk -x network destroy storj-sdk -x network destroy
# ipv6 tests disabled because aws-cli doesn't seem to support connecting to ipv6 host # ipv6 tests disabled because aws-cli doesn't seem to support connecting to ipv6 host