commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/6e02e4f954d2/ Changeset: 6e02e4f954d2 Branch: next-stable User: natefoo Date: 2014-09-23 14:40:39+00:00 Summary: Use common_startup.sh for buildbot instead of maintaining a duplicate copy of the samples list. Affected #: 1 file diff -r 9a05d1ec6f5fb6f95a4c46e14f042b797a13897e -r 6e02e4f954d254787ce9caaf961b0a271bc7bcb6 buildbot_setup.sh --- a/buildbot_setup.sh +++ b/buildbot_setup.sh @@ -42,17 +42,6 @@ /galaxy/software/tool-data/gatk " -SAMPLES=" -config/galaxy.ini.sample -config/shed_tool_data_table_conf.xml.sample -config/migrated_tools_conf.xml.sample -config/shed_data_manager_conf.xml.sample -tool-data/shared/igv/igv_build_sites.txt.sample -tool-data/shared/rviewer/rviewer_build_sites.txt.sample -tool-data/shared/ucsc/builds.txt.sample -tool-data/shared/ucsc/ucsc_build_sites.txt.sample -" - DIRS=" database database/files @@ -100,11 +89,8 @@ ;; esac -for sample in $SAMPLES; do - file=${sample%.sample} - echo "Copying $sample to $file" - cp $sample $file -done +# set up configs from samples. +./scripts/common_startup.sh echo "Copying job_conf.xml.sample_basic to job_conf.xml" cp config/job_conf.xml.sample_basic config/job_conf.xml https://bitbucket.org/galaxy/galaxy-central/commits/05abe03187a1/ Changeset: 05abe03187a1 User: natefoo Date: 2014-09-23 14:40:50+00:00 Summary: Merge next-stable Affected #: 1 file diff -r 7fcc92fb8035f854b0f72085b40ac5f772ff9205 -r 05abe03187a13527b8da8d0421822090a96969a7 buildbot_setup.sh --- a/buildbot_setup.sh +++ b/buildbot_setup.sh @@ -42,17 +42,6 @@ /galaxy/software/tool-data/gatk " -SAMPLES=" -config/galaxy.ini.sample -config/shed_tool_data_table_conf.xml.sample -config/migrated_tools_conf.xml.sample -config/shed_data_manager_conf.xml.sample -tool-data/shared/igv/igv_build_sites.txt.sample -tool-data/shared/rviewer/rviewer_build_sites.txt.sample -tool-data/shared/ucsc/builds.txt.sample -tool-data/shared/ucsc/ucsc_build_sites.txt.sample -" - DIRS=" database database/files @@ -100,11 +89,8 @@ ;; esac -for sample in $SAMPLES; do - file=${sample%.sample} - echo "Copying $sample to $file" - cp $sample $file -done +# set up configs from samples. +./scripts/common_startup.sh echo "Copying job_conf.xml.sample_basic to job_conf.xml" cp config/job_conf.xml.sample_basic config/job_conf.xml Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org