Merge pull request #782 from broadinstitute/dp-dxwdl

Update dxWDL and wdltool

travis/install-wdl.sh

@@ -3,22 +3,23 @@ set -e -o pipefail
 
 cached_fetch_jar_from_github () {
 	_github_org=$1
-	_tool_name=$2
-	_jar_version=$3
+	_repo_name=$2
+	_tool_name=$3
+	_jar_version=$4
 	_jar_fname="$_tool_name-$_jar_version.jar"
 	if [ ! -f $CACHE_DIR/$_jar_fname ]; then
 		echo "Fetching $_jar_fname"
-		wget --quiet https://github.com/$_github_org/$_tool_name/releases/download/$_jar_version/$_jar_fname
+		wget --quiet https://github.com/$_github_org/$_repo_name/releases/download/$_jar_version/$_jar_fname
 		mv $_jar_fname $CACHE_DIR
 	else
 		echo "Using cached $_jar_fname"
 	fi
 	ln -s $CACHE_DIR/$_jar_fname $_tool_name.jar
 }
 
-cached_fetch_jar_from_github broadinstitute wdltool 0.14
-cached_fetch_jar_from_github broadinstitute cromwell 30.2
-cached_fetch_jar_from_github dnanexus dxWDL 0.58.1
+cached_fetch_jar_from_github broadinstitute cromwell womtool 30.2
+cached_fetch_jar_from_github broadinstitute cromwell cromwell 30.2
+cached_fetch_jar_from_github dnanexus dxWDL dxWDL 0.59
 
 TGZ=dx-toolkit-v0.240.1-ubuntu-14.04-amd64.tar.gz
 if [ ! -f $CACHE_DIR/$TGZ ]; then

travis/validate-wdl.sh

@@ -4,6 +4,6 @@ set -e -o pipefail
 ln -s pipes/WDL/workflows/tasks .
 for workflow in pipes/WDL/workflows/*.wdl; do
   echo "validating $workflow"
-  java -jar wdltool.jar validate $workflow
+  java -jar womtool.jar validate $workflow
 done
 rm tasks