[ARVADOS-DEV] updated: 5f2cf1041d2579bc4c29d5691b9ebaf9250f39b8
git at public.curoverse.com
git at public.curoverse.com
Wed Oct 7 10:00:45 EDT 2015
Summary of changes:
jenkins/run-cwl-tests.sh | 79 +++++++++++++++++++++++++++---------------------
1 file changed, 44 insertions(+), 35 deletions(-)
via 5f2cf1041d2579bc4c29d5691b9ebaf9250f39b8 (commit)
from 44b7b4e113d39b34e35d6b2323fee9fbad21611c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 5f2cf1041d2579bc4c29d5691b9ebaf9250f39b8
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Oct 7 10:02:43 2015 -0400
Update cwl builder process for repository reorganization. No issue #
diff --git a/jenkins/run-cwl-tests.sh b/jenkins/run-cwl-tests.sh
index e148171..2aa68c2 100755
--- a/jenkins/run-cwl-tests.sh
+++ b/jenkins/run-cwl-tests.sh
@@ -156,25 +156,38 @@ fi
cd "$WORKSPACE"
-pushd reference
-python setup.py install
-python setup.py test
-./build-node-docker.sh
-popd
+if test -d cwltool ; then
+ (cd cwltool
+ git fetch
+ git reset --hard origin/master
+ )
+else
+ git clone git at github.com:common-workflow-language/cwltool.git
+ (cd cwltool
+ git config user.email "sysadmin at curoverse.com"
+ git config user.name "Curoverse build bot"
+ )
+fi
-pushd conformance
-pwd
-./run_test.sh
-popd
+(cd cwltool
+ python setup.py install
+ python setup.py test
+ ./build-node-docker.sh
+)
-cd reference
-handle_python_package
+./run_test.sh RUNNER=cwltool/cwltool/main.py
-cd cwl-runner
-handle_python_package
-cd ..
+(cd cwltool
+ handle_python_package
+)
-./build-cwl-docker.sh
+(cd cwltool/cwl-runner
+ handle_python_package
+)
+
+(cd cwltool
+ ./build-cwl-docker.sh
+)
if [[ "$UPLOAD_DOCKER" != 0 ]]; then
docker push commonworkflowlanguage/cwltool_module
@@ -182,27 +195,23 @@ if [[ "$UPLOAD_DOCKER" != 0 ]]; then
docker push commonworkflowlanguage/nodejs-engine
fi
-# Setup virtualenv and build documentation.
-
-virtualenv ../venv
-. ../venv/bin/activate
-python setup.py install
-cd ..
-
if test -d common-workflow-language.github.io ; then
- cd common-workflow-language.github.io
- git fetch
- git reset --hard origin/master
- cd ..
+ (cd common-workflow-language.github.io
+ git fetch
+ git reset --hard origin/master
+ )
else
git clone git at github.com:common-workflow-language/common-workflow-language.github.io.git
- cd common-workflow-language.github.io
- git config user.email "sysadmin at curoverse.com"
- git config user.name "Curoverse build bot"
- cd ..
+ (cd common-workflow-language.github.io
+ git config user.email "sysadmin at curoverse.com"
+ git config user.name "Curoverse build bot"
+ )
fi
-python -mcwltool --outdir=$PWD/common-workflow-language.github.io specification/cwlsite.cwl specification/cwlsite-job.json
-cd common-workflow-language.github.io
-git add --all
-git diff-index --quiet HEAD || git commit -m"Build bot"
-git push
+
+python -mcwltool --outdir=$PWD/common-workflow-language.github.io site/cwlsite.cwl site/cwlsite-job.json
+
+(cd common-workflow-language.github.io
+ git add --all
+ git diff-index --quiet HEAD || git commit -m"Build bot"
+ git push
+)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list