Skip to content

Commit

Permalink
FABN-922 uncouple fabric-network
Browse files Browse the repository at this point in the history
uncouple the version dependency between fabric-network
and fabric-client/fabric-ca-client

Change-Id: I1b3fbbbf0facb075fd627341d9314e76a3f66f27
Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
  • Loading branch information
Dave Kelsey committed Sep 17, 2018
1 parent e222a83 commit 300e0e9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 0 additions & 2 deletions fabric-network/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
},
"types": "./types/index.d.ts",
"dependencies": {
"fabric-ca-client": "file:../fabric-ca-client",
"fabric-client": "file:../fabric-client",
"nano": "^6.4.4",
"rimraf": "^2.6.2",
"uuid": "^3.2.1"
Expand Down
8 changes: 4 additions & 4 deletions scripts/Jenkins_Scripts/Publish_NPM_Modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ npmPublish() {

echo "===> Incremented UNSTABLE VERSION --> $UNSTABLE_INCREMENT"

if [ "$1" = "fabric-network" ]; then
sed -i 's/\(.*\"fabric-client\"\: \"\)\(.*\)/\1'$CLIENT_VER\"\,'/' package.json
sed -i 's/\(.*\"fabric-ca-client\"\: \"\)\(.*\)/\1'$CA_CLIENT_VER\"\,'/' package.json
fi
#if [ "$1" = "fabric-network" ]; then
# sed -i 's/\(.*\"fabric-client\"\: \"\)\(.*\)/\1'$CLIENT_VER\"\,'/' package.json
# sed -i 's/\(.*\"fabric-ca-client\"\: \"\)\(.*\)/\1'$CA_CLIENT_VER\"\,'/' package.json
#fi

if [ "$UNSTABLE_VER" = "$CURRENT_RELEASE" ]; then
# Replace existing version with Incremented $UNSTABLE_VERSION
Expand Down

0 comments on commit 300e0e9

Please sign in to comment.