diff options
| author | Petr Mladek <pmladek@suse.cz> | 2012-12-04 12:05:29 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-12-04 12:05:29 +0100 |
| commit | 0d1a06acb76ac687229ccd666fba877527a3c722 (patch) | |
| tree | 90981d919aa84e3d27065c9ab27c210fd5967e24 | |
| parent | d2c42f2c2143c614bb74d2f9603c951d94ab32fe (diff) | |
upload daily builds into <branch>/<builder> instead of <builder>/<branch>
It should make it easier to find the right build. People are more interested
into a particular version than a tinderbox.
| -rwxr-xr-x | bin/push_nightlies.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/push_nightlies.sh b/bin/push_nightlies.sh index c192a9f..2c32443 100755 --- a/bin/push_nightlies.sh +++ b/bin/push_nightlies.sh @@ -63,7 +63,7 @@ fi CURR_HEAD=$(<".git/HEAD") BRANCH="${CURR_HEAD#*/*/}" tag="${BRANCH}~${PULL_TIME}" -ssh upload@gimli.documentfoundation.org "mkdir -p \"/srv/www/dev-builds.libreoffice.org/daily/${BUILDER_NAME}/${BRANCH}/${PULL_TIME}\"" || exit 1 +ssh upload@gimli.documentfoundation.org "mkdir -p \"/srv/www/dev-builds.libreoffice.org/daily/${BRANCH}/${BUILDER_NAME}/${PULL_TIME}\"" || exit 1 if [ -f config_host.mk ] ; then INPATH=$(grep INPATH= config_host.mk | sed -e "s/.*=//") @@ -108,16 +108,16 @@ if [ "$ASYNC" = "1" ] ; then ( ( # do_flock -x 200 - rsync --bwlimit=${BANDWIDTH_LIMIT} -avPe ssh ${stage}/${tag}_* "upload@gimli.documentfoundation.org:/srv/www/dev-builds.libreoffice.org/daily/${BUILDER_NAME}/${BRANCH}/${PULL_TIME}/" || exit 1 + rsync --bwlimit=${BANDWIDTH_LIMIT} -avPe ssh ${stage}/${tag}_* "upload@gimli.documentfoundation.org:/srv/www/dev-builds.libreoffice.org/daily/${BRANCH}/${BUILDER_NAME}/${PULL_TIME}/" || exit 1 if [ "$?" == "0" ] ; then - ssh upload@gimli.documentfoundation.org "cd \"/srv/www/dev-builds.libreoffice.org/daily/${BUILDER_NAME}/${BRANCH}/\" && { rm current; ln -s \"${PULL_TIME}\" current ; }" + ssh upload@gimli.documentfoundation.org "cd \"/srv/www/dev-builds.libreoffice.org/daily/${BRANCH}/${BUILDER_NAME}/\" && { rm current; ln -s \"${PULL_TIME}\" current ; }" fi rm -fr ${stage}/${tag}_* )# 200>${lock_file?} ) & else - rsync --bwlimit=${BANDWIDTH_LIMIT} -avPe ssh ${stage}/${tag}_* "upload@gimli.documentfoundation.org:/srv/www/dev-builds.libreoffice.org/daily/${BUILDER_NAME}/${BRANCH}/${PULL_TIME}/" || exit 1 + rsync --bwlimit=${BANDWIDTH_LIMIT} -avPe ssh ${stage}/${tag}_* "upload@gimli.documentfoundation.org:/srv/www/dev-builds.libreoffice.org/daily/${BRANCH}/${BUILDER_NAME}/${PULL_TIME}/" || exit 1 if [ "$?" == "0" ] ; then - ssh upload@gimli.documentfoundation.org "cd \"/srv/www/dev-builds.libreoffice.org/daily/${BUILDER_NAME}/${BRANCH}/\" && { rm current; ln -s \"${PULL_TIME}\" current ; }" + ssh upload@gimli.documentfoundation.org "cd \"/srv/www/dev-builds.libreoffice.org/daily/${BRANCH}/${BUILDER_NAME}/\" && { rm current; ln -s \"${PULL_TIME}\" current ; }" fi fi |