diff options
| author | Daniel Díaz <daniel.diaz@linaro.org> | 2017-08-30 11:31:28 -0500 |
|---|---|---|
| committer | Daniel Díaz <daniel.diaz@linaro.org> | 2017-09-04 12:09:30 -0500 |
| commit | a79ce1f2275e632df4d6d0a412a6e5f7e118b01e (patch) | |
| tree | afee969a30fe14e4d0f48ff45c56004edd41a4f6 /linaro-hikey-stable-rc-4.4-merge-and-tag.yaml | |
| parent | a65befb1f4c3e984148572fa5b36d264d081aef3 (diff) | |
linaro-hikey-stable-rc-4.4-merge-and-tag: try to merge from new base
For the merge, use Sumit's lts-4.4.y-hikey, which gets
updated every time a 4.4.y stable kernel is released. This
is a good base branch since it is Guodong's original branch
rebased with the latest 4.4.y kernel.
If a conflict arises from the merge operation, then abort
the whole thing; otherwise, let the process continue as
expected.
A merge failure here indicates an important conflict in the
code that needs to be resolved manually by a human (a
knowledgeable one) so that the series of successive merges
do not follow a wrong path.
Change-Id: Ib699fccbd7ac5bc0046a50aaf7a6c89db23f1b7c
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Diffstat (limited to 'linaro-hikey-stable-rc-4.4-merge-and-tag.yaml')
| -rw-r--r-- | linaro-hikey-stable-rc-4.4-merge-and-tag.yaml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linaro-hikey-stable-rc-4.4-merge-and-tag.yaml b/linaro-hikey-stable-rc-4.4-merge-and-tag.yaml index 8cce675ab6..9c890be7e8 100644 --- a/linaro-hikey-stable-rc-4.4-merge-and-tag.yaml +++ b/linaro-hikey-stable-rc-4.4-merge-and-tag.yaml @@ -19,6 +19,9 @@ - linux-stable-rc-4.4: url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git refspec: +refs/heads/linux-4.4.y:refs/remotes/linux-stable-rc-4.4/linux-4.4.y + - sumit-lts: + url: https://git.linaro.org/people/sumit.semwal/linux-lts.git + refspec: +refs/heads/lts-4.4.y-hikey:refs/remotes/sumit-lts/lts-4.4.y-hikey - arm64-stable-rc-4.4: url: ssh://git@git.linaro.org/lkft/arm64-stable-rc.git refspec: +refs/heads/4.4.y-rc-hikey:refs/remotes/arm64-stable-rc-4.4/4.4.y-rc-hikey @@ -59,8 +62,8 @@ ;; esac - # Merge previous tag into stable 4.4.y - git merge -Xours --no-edit $(git tag -l 4.4*rc*-hikey-* | tail -n1) + # Merge HiKey rebased branch into stable 4.4.y + git merge --no-edit sumit-lts/lts-4.4.y-hikey # Apply tag tag=${kernel_version}-hikey-$(date +"%Y%m%d") @@ -75,7 +78,7 @@ condition: SUCCESS trigger-with-no-params: true - email-ext: - recipients: 'sumit.semwal@linaro.org, fathi.boudra@linaro.org' + recipients: 'sumit.semwal@linaro.org, fathi.boudra@linaro.org, daniel.diaz@linaro.org' body: | Project: ${PROJECT_NAME} Build number: ${BUILD_NUMBER} |