Merge branch 'master' of github.com:fabric-composer/fabric-composer

fortya · Mar 14, 2017 · 8bc4b0c · 8bc4b0c
2 parents 38d571d + e2980cd
commit 8bc4b0c
Show file tree

Hide file tree

Showing 22 changed files with 416 additions and 223 deletions.
diff --git a/.travis/deploy.sh b/.travis/deploy.sh
@@ -34,6 +34,17 @@ if [[ "${TRAVIS_REPO_SLUG}" != fabric-composer* ]]; then
     exit 0
 fi
 
+# are we building the docs?
+if [ "${DOCS}" != "" ]; then
+  if [ -z "${TRAVIS_TAG}" ]; then 
+    DOCS="full"
+  else
+    DOCS="unstable"
+  fi
+  ./.travis/deploy_docs.sh
+  exit 0
+fi
+
 
 # Set the NPM access token we will use to publish.
 npm config set registry https://registry.npmjs.org/
@@ -55,7 +66,7 @@ export DOCKER_IMAGES="composer-ui composer-playground"
 
 # Push the code to npm.
 if [ -z "${TRAVIS_TAG}" ]; then
-    DOCS="unstable"
+
     # Set the prerelease version.
     npm run pkgstamp
     export VERSION=$(node -e "console.log(require('${DIR}/package.json').version)")
@@ -96,7 +107,7 @@ if [ -z "${TRAVIS_TAG}" ]; then
     popd
 
 else
-    DOCS="full"
+
     # Grab the current version.
     export VERSION=$(node -e "console.log(require('${DIR}/package.json').version)")
 
@@ -152,9 +163,4 @@ else
     git push origin master
 
 fi
-
-# are we building the docs?
-if [ "${DOCS}" != "" ]; then
-    ./.travis/deploy_docs.sh
-    exit 0
-fi
+date
diff --git a/.travis/deploy_docs.sh b/.travis/deploy_docs.sh
@@ -21,19 +21,21 @@ git config push.default simple
 echo ${DIR}
 cd "${DIR}/packages/composer-website/out"
 
-if [ "${DOCS}" == "unstable" ]; then
-    export REPO="fabric-composer-ubstable.github.io"
-else
-    export REPO="fabric-composer.github.io"
-fi
+export REPO="fabric-composer.github.io"
 
 git clone [email protected]:fabric-composer/${REPO}.git
 git remote set-url origin ${REPO}.git
 
 cd "${DIR}/packages/composer-website/out/${REPO}"
+
+mkdir -p "${DIR}/packages/composer-website/out/${REPO}/unstable"
+
+if [ "${DOCS}" == "full" ]; then
+    rm -rf ${DIR}/packages/composer-website/out/${REPO}/*
+    cp -rf ${DIR}/packages/composer-website/jekylldocs/_site/* .     
+fi
 
-rm -rf ${DIR}/packages/composer-website/out/${REPO}/*
-cp -rf ${DIR}/packages/composer-website/jekylldocs/_site/* .
+cp -rf ${DIR}/packages/composer-website/jekylldocs/_site/* ./unstable  
 
 git add .
 

diff --git a/packages/composer-admin/package.json b/packages/composer-admin/package.json
@@ -43,7 +43,8 @@
   },
   "dependencies": {
     "composer-common": "^0.5.2",
-    "composer-connector-hlf": "^0.5.2"
+    "composer-connector-hlf": "^0.5.2",
+    "composer-connector-hlfv1": "^0.5.2"
   },
   "license-check-config": {
     "src": [

diff --git a/packages/composer-client/package.json b/packages/composer-client/package.json
@@ -44,6 +44,7 @@
   "dependencies": {
     "composer-common": "^0.5.2",
     "composer-connector-hlf": "^0.5.2",
+    "composer-connector-hlfv1": "^0.5.2",
     "uuid": "^3.0.1"
   },
   "devDependencies": {