| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add it83xx and fpsensor/build.mk to picked up required fixes.
BUG=None
BRANCH=None
TEST=Build all on merge commit
Change-Id: I8af5069241f3f26945acff8b7e71ef171da541a9
Signed-off-by: Rob Barnes <robbarnes@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4370602
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commit adds some relevant paths to be included in
the merge commit messages for the dedede firmware branch.
BUG=None
BRANCH=firmware-dedede-13606
TEST=None
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Change-Id: I42b481c6f8dfabed042e5bb701b47323e38d8f3e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3120073
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Auto-Submit: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Diana Z <dzigterman@chromium.org>
|
|
|
This commit adds a script that can be used to update release branches
via a merge strategy from the main branch. It leverages the existing
`update_release_branch.sh` script, but was rewritten in python and
made generic such that it could work with any branch.
It also allows baseboards to be specified along with a separate text
file that can contain other paths of interest.
The default merge strategy is the 'recursive' strategy with the
'theirs' strategy option. The user may provide a different merge
strategy using the '-s' and '-X' options.
The script can be invoked in the following manner:
$ util/update_release_branch.py --baseboard dedede \
--relevant_paths_file util/dedede-relevant-paths.txt \
firmware-dedede-13606.B-master
The syntax for the relevant_paths_file is simple. Each path should be
own its own line and use the glob syntax that `git log` would expect.
Comments may be used with the `#` symbol.
BUG=None
BRANCH=None
TEST=util/update_release_branch.py --baseboard dedede \
--relevant_paths_file util/dedede-relevant-paths.txt \
firmware-dedede-13606.B-master; Verify that merge commit is made and
commit message is as expected.
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Change-Id: Iedd650104bbe6fd231805cf79aedfdca0bd16dd3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2666675
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
Auto-Submit: Aseda Aboagye <aaboagye@chromium.org>
|
