Skip to content

Commit

Permalink
Bump version to v0.19.1, disable next tagging, use Docker image for p…
Browse files Browse the repository at this point in the history
…layground (hyperledger-archives#3708)

Signed-off-by: Simon Stone <[email protected]>
  • Loading branch information
Simon Stone authored Mar 28, 2018
1 parent d64805a commit dd8ad3b
Show file tree
Hide file tree
Showing 31 changed files with 124 additions and 132 deletions.
9 changes: 2 additions & 7 deletions .travis/base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,21 @@ if [ ! -f ${DIR}/build.cfg ]; then
echo "ABORT_CODE=0" >> ${DIR}/build.cfg
## regexp to match the various versions required
V16_REGEXP=v0\.16\.\([0-9]{1,2}\|x\)
LATEST_REGEXP=v0\.\([0-9]{1,2}\)\.\([0-9]{1,2}\)

## determine the build type here
if [ -z "${TRAVIS_TAG}" ]; then
BUILD_RELEASE="unstable"
if [[ "${TRAVIS_BRANCH}" =~ ${V16_REGEXP} ]]; then
BUILD_FOCUS="v0.16"
elif [[ "${TRAVIS_BRANCH}" =~ ${LATEST_REGEXP} ]]; then
BUILD_FOCUS="latest"
else
BUILD_FOCUS="next"
BUILD_FOCUS="latest"
fi
else
BUILD_RELEASE="stable"
if [[ "${TRAVIS_BRANCH}" =~ ${V16_REGEXP} ]]; then
BUILD_FOCUS="v0.16"
elif [[ "${TRAVIS_BRANCH}" =~ ${LATEST_REGEXP} ]]; then
BUILD_FOCUS="latest"
else
BUILD_FOCUS="next"
BUILD_FOCUS="latest"
fi
fi

Expand Down
2 changes: 1 addition & 1 deletion .travis/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ if [[ "${BUILD_FOCUS}" != "v0.16" ]]; then
pushd ${DIR}/packages/composer-playground
rm -rf ${DIR}/packages/composer-playground/node_modules
cf login -a https://api.ng.bluemix.net -u ${CF_USERNAME} -p ${CF_PASSWORD} -o ${CF_ORGANIZATION} -s ${CF_SPACE}
cf push "composer-playground${PLAYGROUND_SUFFIX}" -c "node cli.js" -i 2 -m 128M --no-start
cf push "composer-playground${PLAYGROUND_SUFFIX}" --docker-image hyperledger/composer-playground:${VERSION} -i 2 -m 128M --no-start
cf set-env "composer-playground${PLAYGROUND_SUFFIX}" COMPOSER_CONFIG "${WEB_CFG}"
cf start "composer-playground${PLAYGROUND_SUFFIX}"
popd
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"packages": [
"packages/*"
],
"version": "0.19.0",
"version": "0.19.1",
"hoist": true
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"name": "composer",
"description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.",
"version": "0.19.0",
"version": "0.19.1",
"main": "index.js",
"private": true,
"scripts": {
Expand All @@ -36,4 +36,4 @@
"author": "Hyperledger Composer",
"license": "Apache-2.0",
"dependencies": {}
}
}
10 changes: 5 additions & 5 deletions packages/composer-admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-admin",
"version": "0.19.0",
"version": "0.19.1",
"description": "Hyperledger Composer Admin, code that manages business networks deployed to Hyperledger Fabric",
"engines": {
"node": ">=8",
Expand Down Expand Up @@ -43,10 +43,10 @@
"sinon": "2.3.8"
},
"dependencies": {
"composer-common": "0.19.0",
"composer-connector-hlfv1": "0.19.0",
"composer-wallet-filesystem": "0.19.0",
"composer-wallet-inmemory": "0.19.0"
"composer-common": "0.19.1",
"composer-connector-hlfv1": "0.19.1",
"composer-wallet-filesystem": "0.19.1",
"composer-wallet-inmemory": "0.19.1"
},
"license-check-config": {
"src": [
Expand Down
16 changes: 8 additions & 8 deletions packages/composer-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-cli",
"version": "0.19.0",
"version": "0.19.1",
"description": "Hyperledger Composer command line interfaces (CLIs)",
"engines": {
"node": ">=8",
Expand Down Expand Up @@ -44,13 +44,13 @@
"ajv": "6.1.1",
"chalk": "1.1.3",
"cli-table": "0.3.1",
"composer-admin": "0.19.0",
"composer-client": "0.19.0",
"composer-common": "0.19.0",
"composer-report": "0.19.0",
"composer-wallet-filesystem": "0.19.0",
"composer-wallet-inmemory": "0.19.0",
"composer-documentation": "0.19.0",
"composer-admin": "0.19.1",
"composer-client": "0.19.1",
"composer-common": "0.19.1",
"composer-documentation": "0.19.1",
"composer-report": "0.19.1",
"composer-wallet-filesystem": "0.19.1",
"composer-wallet-inmemory": "0.19.1",
"homedir": "0.6.0",
"js-yaml": "3.10.0",
"mkdirp": "0.5.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/composer-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-client",
"version": "0.19.0",
"version": "0.19.1",
"description": "The node.js client library for Hyperledger Composer, a development framework for Hyperledger Fabric",
"engines": {
"node": ">=8",
Expand Down Expand Up @@ -44,10 +44,10 @@
"logError": true
},
"dependencies": {
"composer-common": "0.19.0",
"composer-connector-hlfv1": "0.19.0",
"composer-wallet-filesystem": "0.19.0",
"composer-wallet-inmemory": "0.19.0",
"composer-common": "0.19.1",
"composer-connector-hlfv1": "0.19.1",
"composer-wallet-filesystem": "0.19.1",
"composer-wallet-inmemory": "0.19.1",
"uuid": "3.0.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/composer-common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-common",
"version": "0.19.0",
"version": "0.19.1",
"description": "Hyperledger Composer Common, code that is common across client, admin and runtime.",
"engines": {
"node": ">=8",
Expand Down
8 changes: 4 additions & 4 deletions packages/composer-connector-embedded/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-connector-embedded",
"version": "0.19.0",
"version": "0.19.1",
"description": "The embedded client connector for Hyperledger Composer",
"engines": {
"node": ">=8",
Expand Down Expand Up @@ -51,9 +51,9 @@
"watchify": "3.7.0"
},
"dependencies": {
"composer-common": "0.19.0",
"composer-runtime": "0.19.0",
"composer-runtime-embedded": "0.19.0"
"composer-common": "0.19.1",
"composer-runtime": "0.19.1",
"composer-runtime-embedded": "0.19.1"
},
"nyc": {
"exclude": [
Expand Down
4 changes: 2 additions & 2 deletions packages/composer-connector-hlfv1/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-connector-hlfv1",
"version": "0.19.0",
"version": "0.19.1",
"description": "The Hyperledger Fabric v1.x Client connector for Hyperledger Composer",
"engines": {
"node": ">=8",
Expand Down Expand Up @@ -41,7 +41,7 @@
"logError": true
},
"dependencies": {
"composer-common": "0.19.0",
"composer-common": "0.19.1",
"fabric-ca-client": "1.1.0",
"fabric-client": "1.1.0",
"fs-extra": "1.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/composer-connector-proxy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-connector-proxy",
"version": "0.19.0",
"version": "0.19.1",
"description": "The proxying client connector for Hyperledger Composer",
"engines": {
"node": ">=8",
Expand Down Expand Up @@ -53,7 +53,7 @@
"watchify": "3.7.0"
},
"dependencies": {
"composer-common": "0.19.0",
"composer-common": "0.19.1",
"socket.io-client": "1.7.3"
},
"nyc": {
Expand Down
8 changes: 4 additions & 4 deletions packages/composer-connector-server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-connector-server",
"version": "0.19.0",
"version": "0.19.1",
"description": "The remote connector server for Hyperledger Composer",
"engines": {
"node": ">=8",
Expand Down Expand Up @@ -45,16 +45,16 @@
"logError": true
},
"dependencies": {
"composer-common": "0.19.0",
"composer-connector-hlfv1": "0.19.0",
"composer-common": "0.19.1",
"composer-connector-hlfv1": "0.19.1",
"serializerr": "1.0.3",
"socket.io": "1.7.3",
"uuid": "3.0.1",
"yargs": "10.0.3"
},
"devDependencies": {
"chai": "3.5.0",
"composer-connector-embedded": "0.19.0",
"composer-connector-embedded": "0.19.1",
"eslint": "3.17.1",
"jsdoc": "3.5.5",
"license-check": "1.1.5",
Expand Down
10 changes: 5 additions & 5 deletions packages/composer-connector-web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-connector-web",
"version": "0.19.0",
"version": "0.19.1",
"description": "The web client connector for Hyperledger Composer",
"engines": {
"node": ">=8",
Expand Down Expand Up @@ -49,7 +49,7 @@
"brfs": "1.4.3",
"chai": "3.5.0",
"chai-as-promised": "6.0.0",
"composer-runtime-pouchdb": "0.19.0",
"composer-runtime-pouchdb": "0.19.1",
"eslint": "3.17.1",
"jsdoc": "3.5.5",
"karma": "1.3.0",
Expand All @@ -65,9 +65,9 @@
"watchify": "3.7.0"
},
"dependencies": {
"composer-common": "0.19.0",
"composer-runtime": "0.19.0",
"composer-runtime-web": "0.19.0",
"composer-common": "0.19.1",
"composer-runtime": "0.19.1",
"composer-runtime-web": "0.19.1",
"uuid": "3.0.1"
}
}
10 changes: 5 additions & 5 deletions packages/composer-cucumber-steps/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-cucumber-steps",
"version": "0.19.0",
"version": "0.19.1",
"description": "A library of Cucumber steps for testing Hyperledger Composer",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -70,10 +70,10 @@
"dependencies": {
"browserfs": "1.1.0",
"chai": "3.5.0",
"composer-admin": "0.19.0",
"composer-client": "0.19.0",
"composer-common": "0.19.0",
"composer-connector-embedded": "0.19.0",
"composer-admin": "0.19.1",
"composer-client": "0.19.1",
"composer-common": "0.19.1",
"composer-connector-embedded": "0.19.1",
"thenify-all": "1.6.0"
}
}
11 changes: 5 additions & 6 deletions packages/composer-documentation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-documentation",
"version": "0.19.0",
"version": "0.19.1",
"description": "Generates documentation packages for Hyperlegder Composer Business Networks",
"bin": {
"opus": "bin/opus"
Expand Down Expand Up @@ -37,9 +37,9 @@
"dependencies": {
"chalk": "1.1.3",
"comment-parser": "0.4.0",
"composer-admin": "0.19.0",
"composer-client": "0.19.0",
"composer-common": "0.19.0",
"composer-admin": "0.19.1",
"composer-client": "0.19.1",
"composer-common": "0.19.1",
"debug-stream": "3.0.1",
"doctrine": "2.0.0",
"js-yaml": "3.10.0",
Expand All @@ -55,8 +55,7 @@
"rimraf": "2.5.4",
"vinyl-fs": "2.4.4",
"yargs": "10.0.3"
}
,
},
"license-check-config": {
"src": [
"**/*.js",
Expand Down
6 changes: 3 additions & 3 deletions packages/composer-playground-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-playground-api",
"version": "0.19.0",
"version": "0.19.1",
"description": "The REST API for the Hyperledger Composer Playground",
"engines": {
"node": ">=8",
Expand Down Expand Up @@ -59,8 +59,8 @@
"dependencies": {
"async": "2.5.0",
"body-parser": "1.17.0",
"composer-common": "0.19.0",
"composer-connector-server": "0.19.0",
"composer-common": "0.19.1",
"composer-connector-server": "0.19.1",
"dotenv": "4.0.0",
"express": "4.15.2",
"http-status": "1.0.1",
Expand Down
22 changes: 11 additions & 11 deletions packages/composer-playground/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-playground",
"version": "0.19.0",
"version": "0.19.1",
"description": "A test harness/UI for the web runtime container for Hyperledger Composer",
"engines": {
"node": ">=8",
Expand Down Expand Up @@ -98,10 +98,10 @@
},
"dependencies": {
"cheerio": "0.22.0",
"composer-common": "0.19.0",
"composer-playground-api": "0.19.0",
"composer-wallet-filesystem": "0.19.0",
"composer-wallet-inmemory": "0.19.0",
"composer-common": "0.19.1",
"composer-playground-api": "0.19.1",
"composer-wallet-filesystem": "0.19.1",
"composer-wallet-inmemory": "0.19.1",
"express": "4.15.2",
"is-docker": "1.1.0",
"opener": "1.4.2",
Expand Down Expand Up @@ -151,12 +151,12 @@
"clone": "2.1.1",
"codelyzer": "2.0.1",
"codemirror": "5.26.0",
"composer-admin": "0.19.0",
"composer-client": "0.19.0",
"composer-connector-proxy": "0.19.0",
"composer-connector-web": "0.19.0",
"composer-runtime": "0.19.0",
"composer-runtime-web": "0.19.0",
"composer-admin": "0.19.1",
"composer-client": "0.19.1",
"composer-connector-proxy": "0.19.1",
"composer-connector-web": "0.19.1",
"composer-runtime": "0.19.1",
"composer-runtime-web": "0.19.1",
"copy-webpack-plugin": "4.0.1",
"core-js": "2.4.1",
"css-loader": "0.26.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/composer-report/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-report",
"version": "0.19.0",
"version": "0.19.1",
"description": "Hyperledger Composer diagnostics",
"bin": "bin/cmd.js",
"main": "lib/report.js",
Expand Down
Loading

0 comments on commit dd8ad3b

Please sign in to comment.