-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Pull submodules #1583
Pull submodules #1583
Conversation
should we have a blurb about what we're picking up from these updates? |
Do you mean appending something like --pretty=oneline in the description or something manual? |
I was thinking that some rationale would be offered, but perhaps that could be a policy for non-master branches. |
Current rationale is
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be okay, but we'll need to think about what our policy should be for updating openthread and https://github.com/openthread/ot-br-posix.git such that possilble regressions are avoided. once we have stable Thread support. Perhaps a good simulation framework such as cirque can help here. @gjc13
Is this is addressable with use of a specific hash instead of a branch (as repos.conf is just a symlink)?
Fair enough for master. |
It's using specific hashes, however the hash in .gitmodules has fallen out of sync with the one in the git tree. We can certainly sync them back up without pulling everything, though.
|
I think that the repos.conf workflow is unaware of the hashes, only git submodules is. That's what produces the skew. I'm suggesting that the .gitmodules file use an @ format so that the repos.conf workflow matches the git submodules workflow. |
Actually we already fixed that. That's what the "commit" lines in the .gitmodules are. But you either need to use pull_submodules.sh to update both at the same time, or keep them in sync manually. |
@mspang - requires conflict fixing before merge |
a6c4ad6
to
30a7110
Compare
Via scripts/helpers/pull_submodules.sh Updates: git -C examples/common/m5stack-tft/repo log 42cadf2..42cadf2 git -C third_party/openthread/repo log 4806fa4d0..c6d5c4aae git -C third_party/ot-br-posix/repo log 77a9156..250c6d6 git -C third_party/pigweed/repo log 023f35b..ce87bc0
30a7110
to
aa83e9d
Compare
Size increase report for "gn_nrf-example-build"
Full report output
|
Size increase report for "gn_linux-example-build"
Full report output
|
Size increase report for "nrf-example-build"
Full report output
|
Size increase report for "linux-example-build"
Full report output
|
Size increase report for "esp32-example-build"
Full report output
|
Via scripts/helpers/pull_submodules.sh Updates: git -C examples/common/m5stack-tft/repo log 42cadf2..42cadf2 git -C third_party/openthread/repo log 4806fa4d0..c6d5c4aae git -C third_party/ot-br-posix/repo log 77a9156..250c6d6 git -C third_party/pigweed/repo log 023f35b..ce87bc0
Via scripts/helpers/pull_submodules.sh Updates: git -C examples/common/m5stack-tft/repo log 42cadf2..42cadf2 git -C third_party/openthread/repo log 4806fa4d0..c6d5c4aae git -C third_party/ot-br-posix/repo log 77a9156..250c6d6 git -C third_party/pigweed/repo log 023f35b..ce87bc0
Via scripts/helpers/pull_submodules.sh
Updates:
git -C examples/common/m5stack-tft/repo log 42cadf2..42cadf2
git -C third_party/openthread/repo log 5f0e36eeb..b9a7903f1
git -C third_party/ot-br-posix/repo log 77a9156..eefef71
git -C third_party/pigweed/repo log 023f35b..34d9b07