From a915348c6c5be0d23584bb8223ad10de34e89017 Mon Sep 17 00:00:00 2001 From: torresashjian Date: Mon, 1 Apr 2019 12:36:41 -0700 Subject: [PATCH 1/3] Move install instructions to docs and create install.sh script --- README.md | 11 +---------- scripts/install.sh | 6 ++++++ 2 files changed, 7 insertions(+), 10 deletions(-) create mode 100644 scripts/install.sh diff --git a/README.md b/README.md index 208ca7e..7101955 100644 --- a/README.md +++ b/README.md @@ -10,16 +10,7 @@ This allows definition of your smart contracts on a model driven approach and ab ## Installation -Install [Go version 1.11.x](https://golang.org/doc/install) and [set GOPATH environment variable](https://golang.org/doc/code.html#GOPATH). Clone this project, then install and test it as follows: -``` -export PATH=${GOPATH}/bin:${PATH} -go get -u -d github.com/TIBCOSoftware/dovetail-cli -cd ${GOPATH}/src/github.com/TIBCOSoftware/dovetail-cli -make -``` -If you see test errors, please refer the Troubleshooting or Support section below. - -For step by step instructions on how to setup Project Dovetailâ„¢ environment, please go to the installation section on the [documentation page](https://tibcosoftware.github.io/dovetail/getting-started/getting-started-cli/) +For step by step instructions on how to setup Project Dovetailâ„¢ cli environment, please go to the installation section on the [documentation page](https://tibcosoftware.github.io/dovetail/getting-started/getting-started-cli/) ### Note on third party dependencies diff --git a/scripts/install.sh b/scripts/install.sh new file mode 100644 index 0000000..e415ddb --- /dev/null +++ b/scripts/install.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +echo "Installing dovetail-cli..." +go get -u -d github.com/TIBCOSoftware/dovetail-cli +cd ${GOPATH}/src/github.com/TIBCOSoftware/dovetail-cli +make install \ No newline at end of file From 5d161462c17858ad483da612020f3cefa22e5ed6 Mon Sep 17 00:00:00 2001 From: torresashjian Date: Tue, 2 Apr 2019 11:19:45 -0700 Subject: [PATCH 2/3] Add a build from source section --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 7101955..54c7696 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,21 @@ This allows definition of your smart contracts on a model driven approach and ab For step by step instructions on how to setup Project Dovetailâ„¢ cli environment, please go to the installation section on the [documentation page](https://tibcosoftware.github.io/dovetail/getting-started/getting-started-cli/) +## Build dovetail cli from source + +Install [Go version 1.11.x](https://golang.org/doc/install) and [set GOPATH environment variable](https://golang.org/doc/code.html#GOPATH). Then install and test it as follows: + +``` +export PATH=${GOPATH}/bin:${PATH} +go get -u -d github.com/TIBCOSoftware/dovetail-cli +cd ${GOPATH}/src/github.com/TIBCOSoftware/dovetail-cli +make +``` + +If you want to just install the cli and not run any tests use "make install" command instead of "make". + +If you see test errors, please refer the Troubleshooting or Support section below. + ### Note on third party dependencies Once you install the cli, [these](./go.sum) third party dependencies will be downloaded to your machine. Please note that these third party dependencies are subject to their own license terms. From f60df063f47a18ceebdbd91bd074d8915f9acd2f Mon Sep 17 00:00:00 2001 From: torresashjian Date: Fri, 26 Apr 2019 13:03:58 -0700 Subject: [PATCH 3/3] Remove hyperledger tests --- .travis.yml | 10 +--------- Makefile | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d6c5a6..1e687a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,4 @@ - "1.11" script: - make depend - - make - notifications: - email: - recipients: - - mtorres@tibco.com - #- yxu@tibco.com - #- mwenyan@tibco.com - on_success: never # default: change - on_failure: always # default: always \ No newline at end of file + - make \ No newline at end of file diff --git a/Makefile b/Makefile index aa98f87..9876b1a 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ buildtype: install @$(SCRIPTS_PATH)/buildtype.sh .PHONY: test_all -all: dovetail-tests hyperledger-fabric-tests corda-tests +test_all: dovetail-tests hyperledger-fabric-tests corda-tests .PHONY: dovetail-tests dovetail-tests: