Skip to content

Commit

Permalink
[FAB-6928] Update CI to v1.0.4
Browse files Browse the repository at this point in the history
Change-Id: If8d83803dceb2a6577a64cb7c4768e1b94286fb4
Signed-off-by: Troy Ronda <troy@troyronda.com>
  • Loading branch information
troyronda committed Nov 8, 2017
1 parent 5c79a68 commit 7731bd8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ FABRIC_SDK_EXTRA_GO_TAGS ?=
FABRIC_SDK_POPULATE_VENDOR ?= true

# Fabric tool versions (overridable)
FABRIC_TOOLS_VERSION ?= 1.0.3
FABRIC_TOOLS_VERSION ?= 1.0.4
FABRIC_BASE_VERSION ?= 0.4.2

# Fabric base docker image (overridable)
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ You're good to go, happy coding! Check out the examples for usage demonstrations
### Examples

- [E2E Test](test/integration/end_to_end_test.go) and [Base Test](test/integration/base_test_setup.go): Part of the E2E tests included with the Go SDK.
- [Dynamic Endorser Selection] (test/integration/sdk_provider_test.go) : An example that uses dynamic endorser selection (based on chaincode policy)
- [Dynamic Endorser Selection](test/integration/sdk_provider_test.go): An example that uses dynamic endorser selection (based on chaincode policy)
- [CLI](https://github.com/securekey/fabric-examples/tree/master/fabric-cli/): An example CLI for Fabric built with the Go SDK.
- More examples needed!

Expand All @@ -37,7 +37,7 @@ You're good to go, happy coding! Check out the examples for usage demonstrations

### Compatibility

- fabric v1.0.1 & fabric-ca v1.0.1
- fabric v1.0.4 & fabric-ca v1.0.4
- fabric-sdk-go: master:HEAD
- fabric v1.0.0 & fabric-ca v1.0.0
- fabric-sdk-go: master:110bf21bf3ab0a9a084f46d9698e1daeeda68a59
Expand All @@ -64,7 +64,7 @@ If you want to contribute to the Go SDK, please run the test suite and submit pa

You need:

- Go
- Go 1.9
- [Dep](https://github.com/golang/dep)
- Make
- Docker
Expand Down Expand Up @@ -155,14 +155,14 @@ Alternatively you can build and run Fabric on your own box using the following c
cd $GOPATH/src/github.com/hyperledger/
git clone https://github.com/hyperledger/fabric
cd $GOPATH/src/github.com/hyperledger/fabric/
git checkout v1.0.1
git checkout v1.0.4
make docker

# Build fabric-ca:
cd $GOPATH/src/github.com/hyperledger/
git clone https://github.com/hyperledger/fabric-ca
cd $GOPATH/src/github.com/hyperledger/fabric-ca/
git checkout v1.0.1
git checkout v1.0.4
make docker

# Start fabric - latest-env.sh overrides the default docker tags in .env
Expand Down
10 changes: 5 additions & 5 deletions test/fixtures/.env
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ ARCH=x86_64
CORE_PEER_NETWORKID=fabsdkgo
COMPOSE_PROJECT_NAME=fabsdkgo

FABRIC_CA_FIXTURE_TAG=1.0.3
FABRIC_ORDERER_FIXTURE_TAG=1.0.3
FABRIC_PEER_FIXTURE_TAG=1.0.3
FABRIC_COUCHDB_FIXTURE_TAG=1.0.3
FABRIC_BUILDER_FIXTURE_TAG=1.0.3
FABRIC_CA_FIXTURE_TAG=1.0.4
FABRIC_ORDERER_FIXTURE_TAG=1.0.4
FABRIC_PEER_FIXTURE_TAG=1.0.4
FABRIC_COUCHDB_FIXTURE_TAG=1.0.4
FABRIC_BUILDER_FIXTURE_TAG=1.0.4
FABRIC_BASEOS_FIXTURE_TAG=0.4.2
FABRIC_BASEIMAGE_FIXTURE_TAG=0.4.2

Expand Down

0 comments on commit 7731bd8

Please sign in to comment.