diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-11-17 09:54:19 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-11-17 09:54:19 +0100 |
| commit | 68a902345d0643c303379599d7d29471ca296700 (patch) | |
| tree | 21240ae6279a6999e904613eda239ba34f1bc62c /dts/scripts/cronjob | |
| parent | 80c2876fd7d8f4b8bb0caa3160b966147e6c8d46 (diff) | |
| download | barebox-68a902345d0643c303379599d7d29471ca296700.tar.gz barebox-68a902345d0643c303379599d7d29471ca296700.tar.xz | |
dts: update to v4.14-rc6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/scripts/cronjob')
| -rwxr-xr-x | dts/scripts/cronjob | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/dts/scripts/cronjob b/dts/scripts/cronjob index eeedca0506..628e91ea0d 100755 --- a/dts/scripts/cronjob +++ b/dts/scripts/cronjob @@ -77,15 +77,15 @@ echo #echo DATE=$(date +%Y%m%d) -LATEST=latest-${DATE} +TESTBRANCH=test-${DATE} MERGE_OUTPUT=`( set -e -git checkout -b ${LATEST} origin/master +git checkout -b ${TESTBRANCH} origin/master git merge --no-edit upstream/dts ) 2>&1 ` -REF=$(git show-ref --verify refs/heads/${LATEST}) +REF=$(git show-ref --verify refs/heads/${TESTBRANCH}) echo "Testing: ${REF}" -if git log ${LATEST} -- MAINTAINERS | grep --quiet . ; then +if git log ${TESTBRANCH} -- MAINTAINERS | grep --quiet . ; then echo "Filter branch has upstream-only content (MAINTAINERS file)" exit 1 fi @@ -105,6 +105,12 @@ echo echo "Switching back to master branch" git checkout master +echo "Recording refs/tests/${DATE}" +git update-ref refs/tests/${DATE} ${TESTBRANCH} + +echo "Removing ${TESTBRANCH}" +git branch -D "${TESTBRANCH}" + echo "Final State:" for branch in ${BRANCHES} ; do REF=$(git show-ref --verify refs/heads/${branch}) |