Skip to content

Commit

Permalink
Suppress cwltool instructions for workflows (#608)
Browse files Browse the repository at this point in the history
* Suppress cwltool instructions for workflows

* Note workflow id is also needed

* Revert "Feature/2264/incompatibleVersions (#600)"

This reverts commit be3c047.
  • Loading branch information
denis-yuen authored Mar 29, 2019
1 parent 3d8aaf1 commit 8e38eef
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sudo: required
dist: trusty
language: node_js
node_js:
- '8.11.1'
- '10.13.0'
services:
- postgresql
jdk:
Expand All @@ -21,7 +21,6 @@ addons:
chrome: stable

install:
- npm i -g @angular/[email protected] --unsafe
- ./scripts/install-travis-script.sh

jobs:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion scripts/install-travis-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/app/workflow/launch/launch.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
{{cwlrunnerDescription}}
<pre>{{ cwl }}</pre>
</div>
<!-- cwltool instructions for workflows will need to wait for https://github.com/common-workflow-language/cwltool/pull/1093
<div [matTooltip]="cwltoolTooltip">
Alternatively, <a href="https://github.com/common-workflow-language/cwltool">cwltool</a> can conveniently
run
Expand All @@ -73,6 +74,7 @@
<pre>{{ dockstoreSupportedCwlLaunch }}</pre> cwltool can also be used to create the input template:
<pre>{{ dockstoreSupportedCwlMakeTemplate }}</pre>
</div>
-->
</mat-card>
<app-launch-checker-workflow [versionName]="_selectedVersion?.name" [command]="checkEntryCommand"></app-launch-checker-workflow>
</div>
Expand Down
8 changes: 8 additions & 0 deletions src/app/workflow/launch/workflow-launch.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`;
}
Expand Down

0 comments on commit 8e38eef

Please sign in to comment.