Skip to content

Commit

Permalink
Merge pull request #65 from broadinstitute/dp-trs-build
Browse files Browse the repository at this point in the history
travis small tweaks
  • Loading branch information
dpark01 committed May 13, 2020
2 parents 75872c8 + 87476b5 commit dbda0fa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
12 changes: 2 additions & 10 deletions travis/build-dx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,6 @@ for workflow in pipes/WDL/workflows/*.wdl; do
workflow_name=`basename $workflow .wdl`
echo "Building $workflow to DNAnexus: /build/$VERSION/$workflow_name"

test_input_json_wdl="test/input/WDL/test_inputs-$workflow_name-dnanexus.json"
if [ -f "$test_input_json_wdl" ]; then
CMD_INPUT="-inputs $test_input_json_wdl"
# blank this out until we're sure we want to test it this way...
CMD_INPUT=""
else
CMD_INPUT=""
fi

defaults_json="pipes/dnax/dx-defaults-$workflow_name.json"
if [ -f "$defaults_json" ]; then
CMD_DEFAULTS="-defaults $defaults_json"
Expand All @@ -44,7 +35,8 @@ for workflow in pipes/WDL/workflows/*.wdl; do
CMD_DEFAULTS+=" -extras $extras_json"

dx_id=$(java -jar dxWDL.jar compile \
$workflow $CMD_INPUT $CMD_DEFAULTS -f -verbose \
$workflow $CMD_DEFAULTS -f -verbose \
-leaveWorkflowsOpen \
-imports pipes/WDL/tasks/ \
-project $DX_PROJECT \
-destination /build/$VERSION/$workflow_name)
Expand Down
2 changes: 2 additions & 0 deletions travis/dockstoreyml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ for WDL in $*; do
echo " - name: $(basename $WDL .wdl)"
echo " subclass: WDL"
echo " primaryDescriptorPath: $WDL"
echo " testParameterFiles:"
echo " - empty.json"
done

0 comments on commit dbda0fa

Please sign in to comment.