Skip to content

Commit

Permalink
Squashed 'cwltool/schemas/' changes from 0d75172e..26482cc7
Browse files Browse the repository at this point in the history
26482cc7 Add 'doc' field to InputSchema
b38788cb Add doc field to record
2f8906d1 Conformance tests for secondaryFiles on input and output record fields.
54ef74ee Conformance tests for secondaryFiles on record fields.
ca7cba78 rename conflicting steps
836187e9 drop --user from Travis
53ad516b Restore stdin shortcut test.
4e307e36 Sync with v1.0 tests
aee2fbbe Refactor to fix secondaryFiles on record fields, consolidate fields, use new subscope feature.
53b626aa Spec clarification for #331
064f8bff Add explicit defaults for some fields.
8d96c02c Synchronize with v1.0.2
6178438c Merge pull request #635 from common-workflow-language/categorize_tests
3d4893e0 tag the tests
REVERT: 0d75172e Refactor to fix secondaryFiles on record fields, consolidate fields, use new subscope feature.
REVERT: 005c9c91 Spec clarification for #331
REVERT: 9ce6f8c8 Add explicit defaults for some fields.
REVERT: fd9861b0 Synchronize with v1.0.2

git-subtree-dir: cwltool/schemas
git-subtree-split: 26482cc74f57adbe03650f3fbc43fbc49d741772
  • Loading branch information
Peter Amstutz committed Mar 20, 2018
1 parent 09bca4a commit 2c5f75e
Show file tree
Hide file tree
Showing 21 changed files with 780 additions and 67 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ language: python
python:
- 2.7
before_script:
- git clone https://github.com/common-workflow-language/schema_salad.git salad && cd ./salad && pip install . --user && cd ..
- git clone https://github.com/common-workflow-language/schema_salad.git salad && cd ./salad && pip install . && cd ..
script:
- for target in v1.0/v1.0/*.cwl; do schema-salad-tool ./salad/schema_salad/tests/test_schema/CommonWorkflowLanguage.yml ${target} || exit 1; done
Loading

0 comments on commit 2c5f75e

Please sign in to comment.