Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ addons:
packages:
- graphviz
before_install: |
date
set -ev
set -o pipefail
./.travis/should-run.sh
Expand All @@ -31,17 +32,18 @@ before_install: |
wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add -
echo "deb http://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
sudo apt-get update && sudo apt-get install cf-cli
date
install: |
date
set -ev
set -o pipefail
npm install 2>&1 | tee
date
script: ./.travis/script.sh
deploy:
provider: script
script: ./.travis/deploy.sh
skip_cleanup: true
on:
all_branches: true
cache:
directories:
- $HOME/.npm
cache: false
3 changes: 2 additions & 1 deletion .travis/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -o pipefail

# Grab the Concerto directory.
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"

date
# Check that this is the right node.js version.
if [ "${TRAVIS_NODE_VERSION}" != "" -a "${TRAVIS_NODE_VERSION}" != "4" ]; then
echo Not executing as not running primary node.js version.
Expand Down Expand Up @@ -120,3 +120,4 @@ else
git push origin develop

fi
date
3 changes: 2 additions & 1 deletion .travis/deploy_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -o pipefail

# Grab the directory.
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"

date
# Set the GitHub deploy key we will use to publish.
set-up-ssh --key "$encrypted_f19708b15817_key" \
--iv "$encrypted_f19708b15817_iv" \
Expand Down Expand Up @@ -35,3 +35,4 @@ git add .

git commit -m "Automated deploy to ${REPO}"
git push
date
2 changes: 2 additions & 0 deletions .travis/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set -o pipefail
# Grab the Concerto directory.
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"

date
# Start the X virtual frame buffer used by Karma.
if [ -r "/etc/init.d/xvfb" ]; then
export DISPLAY=:99.0
Expand Down Expand Up @@ -36,3 +37,4 @@ else
npm run build:prod

fi
date
11 changes: 6 additions & 5 deletions packages/composer-cli/lib/cmds/archive/createCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ module.exports.command = 'create [options]';
module.exports.describe = 'Create the details of a Business Network Archive';
module.exports.builder = function (yargs){

return yargs.option('archiveFile',{alias: 'a', required: false, describe: 'Business network archive file name. Default is based on the Identifier of the BusinessNetwork', type: 'string' })
.option('inputDir',{alias: 'd', required: false, describe: 'Location to create the archive from e.g. NPM module directory'})
.option('moduleName',{alias: 'm', required: false, describe: 'Name of the npm module to use '})
.conflicts('inputDir','moduleName')
.epilog('Only one of either inputDir or moduleName must be specified.');
return yargs.option('archiveFile',{alias: 'a', required: false, describe: 'Business network archive file name. Default is based on the Identifier of the BusinessNetwork', type: 'string' })
.option('sourceType',{alias: 't', required: true, choices: ['module','dir'], describe: 'npm module name or a directory as the source of the Business Network'})
.option('sourceName',{alias: 'n', required: true, describe: 'Name of the npm module or directory'})
.usage('');

};


Expand All @@ -36,6 +36,7 @@ module.exports.handler = (argv) => {
process.exit(0);
})
.catch((error) => {

console.log(error+ '\nCommand failed.');
process.exit(1);
});
Expand Down