Skip to content

Commit 4bd9574

Browse files
arnerpasquale95
andauthored
added test committer as option to run the sample, update fsc and fts (hyperledger#43)
Signed-off-by: Arne Rutjes <arne123@gmail.com> Signed-off-by: pco <pasquale.convertini@ibm.com> Co-authored-by: pco <pasquale.convertini@ibm.com>
1 parent 2a9f7ad commit 4bd9574

37 files changed

Lines changed: 1225 additions & 698 deletions

samples/tokens/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# Ansible
88
ansible/collections
99
out/
10+
crypto/
1011

1112
# Misc
1213
bin/

samples/tokens/Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ PLATFORM ?= fabricx
77
CONF_ROOT=conf
88

99
ifeq ($(PLATFORM),fabricx)
10-
include ./fabricx.mk
10+
include ./fabricx_ansible.mk
11+
else ifeq ($(PLATFORM),xdev)
12+
include ./fabricx_dev.mk
1113
else
1214
include ./fabric3.mk
1315
endif
@@ -17,6 +19,7 @@ include ./app.mk
1719
# Install the utilities needed to run the components on the targeted remote hosts (e.g. make install-prerequisites).
1820
.PHONY: install-prerequisites
1921
install-prerequisites: install-prerequisites-fabric
22+
./install-fabric.sh --fabric-version 3.1.1
2023
go mod tidy
2124

2225
# Build all the artifacts and binaries, and copy them to the application folders
@@ -25,7 +28,7 @@ setup: clean setup-fabric setup-app
2528

2629
# Start a Fabric and token network.
2730
.PHONY: start
28-
start: start-fabric create-namespace start-app
31+
start: start-fabric start-app
2932

3033
# Teardown Fabric and the token network.
3134
.PHONY: teardown
@@ -35,7 +38,7 @@ teardown: teardown-app teardown-fabric
3538
.PHONY: stop
3639
stop: stop-app stop-fabric
3740

38-
# Remove all generated crypto.
41+
# Remove all generated crypto. Requires a `make setup` to restore.
3942
.PHONY: clean
4043
clean: clean-app clean-fabric
4144

0 commit comments

Comments
 (0)