diff --git a/.travis.yml b/.travis.yml index 020a1ca522..5bad631f24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required dist: trusty language: node_js node_js: - - '8.11.1' + - '10.13.0' services: - postgresql jdk: @@ -21,7 +21,6 @@ addons: chrome: stable install: - - npm i -g @angular/cli@6.0.2 --unsafe - ./scripts/install-travis-script.sh jobs: @@ -32,7 +31,7 @@ jobs: - ng lint - ng test --watch=false --code-coverage --browsers ChromeHeadless - ng version - - travis_wait 30 npm run build.prod + - npm run build.prod - stage: integration test name: "Cypress Group 1" env: diff --git a/scripts/install-travis-script.sh b/scripts/install-travis-script.sh index 13a13ee801..6dc7a5d1ba 100755 --- a/scripts/install-travis-script.sh +++ b/scripts/install-travis-script.sh @@ -4,7 +4,7 @@ set -o pipefail set -o nounset set -o xtrace -npm install +npm ci wget --no-verbose --tries=10 https://artifacts.oicr.on.ca/artifactory/collab-release/io/dockstore/dockstore-webservice/${WEBSERVICE_VERSION}/dockstore-webservice-${WEBSERVICE_VERSION}.jar chmod u+x dockstore-webservice-${WEBSERVICE_VERSION}.jar diff --git a/src/app/workflow/launch/launch.component.html b/src/app/workflow/launch/launch.component.html index ca21c3d117..5d95398301 100644 --- a/src/app/workflow/launch/launch.component.html +++ b/src/app/workflow/launch/launch.component.html @@ -65,6 +65,7 @@ {{cwlrunnerDescription}}
{{ cwl }}
+ diff --git a/src/app/workflow/launch/workflow-launch.service.ts b/src/app/workflow/launch/workflow-launch.service.ts index 8e01a55e1e..663c3ab5e6 100644 --- a/src/app/workflow/launch/workflow-launch.service.ts +++ b/src/app/workflow/launch/workflow-launch.service.ts @@ -36,6 +36,14 @@ export class WorkflowLaunchService extends LaunchService { \nvim Dockstore.json`; } + getDockstoreSupportedCwlLaunchString(path: string, versionName: string) { + return `cwltool \\#workflow/${path}:${versionName} Dockstore.json`; + } + + getDockstoreSupportedCwlMakeTemplateString(path: string, versionName: string) { + return `cwltool --make-template \\#workflow/${path}:${versionName} > input.yaml`; + } + getCliString(path: string, versionName: string, currentDescriptor: string) { return `dockstore ${this.type} launch --entry ${path}:${versionName} --json Dockstore.json`; }