minor, enhance dev-support scripts
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/792d4ee3 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/792d4ee3 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/792d4ee3 Branch: refs/heads/orderedbytes Commit: 792d4ee3fd3f12b63a34a47bb90ed7b87449f15a Parents: 937cc54 Author: Yang Li <liy...@apache.org> Authored: Tue Oct 4 16:55:46 2016 +0800 Committer: Yang Li <liy...@apache.org> Committed: Tue Oct 4 16:55:46 2016 +0800 ---------------------------------------------------------------------- dev-support/sync_hbase_cdh_branches.cmd | 43 -------------------------- dev-support/sync_hbase_cdh_branches.sh | 45 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/792d4ee3/dev-support/sync_hbase_cdh_branches.cmd ---------------------------------------------------------------------- diff --git a/dev-support/sync_hbase_cdh_branches.cmd b/dev-support/sync_hbase_cdh_branches.cmd deleted file mode 100644 index ed828ca..0000000 --- a/dev-support/sync_hbase_cdh_branches.cmd +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -# ============================================================================ - -base=master - -# ============================================================================ - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -function error() { - SCRIPT="$0" # script name - LASTLINE="$1" # line of error occurrence - LASTERR="$2" # error code - echo "ERROR exit from ${SCRIPT} : line ${LASTLINE} with exit code ${LASTERR}" - exit 1 -} -trap 'error ${LINENO} ${?}' ERR - -# ============================================================================ - -git fetch apache -git checkout apache/$base-hbase1.x -git format-patch -1 -git checkout apache/$base-cdh1.x -git format-patch -1 - -git checkout apache/$base -git checkout -b tmp -git reset apache/$base --hard - -git am -3 --ignore-whitespace 0001-KYLIN-1528-Create-a-branch-for-v1.5-with-HBase-1.x-A.patch -#git push apache tmp:$base-hbase1.x -f -rm 0001-KYLIN-1528-Create-a-branch-for-v1.5-with-HBase-1.x-A.patch - -git am -3 --ignore-whitespace 0001-KYLIN-1672-support-kylin-on-cdh-5.7.patch -#git push apache tmp:$base-cdh5.7 -f -rm 0001-KYLIN-1672-support-kylin-on-cdh-5.7.patch - -# clean up -git checkout master -git reset apache/master --hard -git checkout -b tmp http://git-wip-us.apache.org/repos/asf/kylin/blob/792d4ee3/dev-support/sync_hbase_cdh_branches.sh ---------------------------------------------------------------------- diff --git a/dev-support/sync_hbase_cdh_branches.sh b/dev-support/sync_hbase_cdh_branches.sh new file mode 100644 index 0000000..f52284a --- /dev/null +++ b/dev-support/sync_hbase_cdh_branches.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +# ============================================================================ + +base=master + +# ============================================================================ + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +function error() { + SCRIPT="$0" # script name + LASTLINE="$1" # line of error occurrence + LASTERR="$2" # error code + echo "ERROR exit from ${SCRIPT} : line ${LASTLINE} with exit code ${LASTERR}" + exit 1 +} +trap 'error ${LINENO} ${?}' ERR + +# ============================================================================ + +git fetch apache +git checkout apache/$base-hbase1.x +git format-patch -1 +git checkout apache/$base-cdh5.7 +git format-patch -1 + +git checkout apache/$base +git checkout -b tmp +git reset apache/$base --hard + +git am -3 --ignore-whitespace 0001-KYLIN-1528-Create-a-branch-for-v1.5-with-HBase-1.x-A.patch +mvn clean compile -DskipTests +git push apache tmp:$base-hbase1.x -f +rm 0001-KYLIN-1528-Create-a-branch-for-v1.5-with-HBase-1.x-A.patch + +git am -3 --ignore-whitespace 0001-KYLIN-1672-support-kylin-on-cdh-5.7.patch +mvn clean compile -DskipTests +git push apache tmp:$base-cdh5.7 -f +rm 0001-KYLIN-1672-support-kylin-on-cdh-5.7.patch + +# clean up +git checkout master +git reset apache/master --hard +git branch -D tmp
