-
Notifications
You must be signed in to change notification settings - Fork 3k
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
LPC1768 us_ticker.c timer choice #8122
Conversation
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.
LGTM (once the == 2 is fixed)! Also squashing if possible would be nice.
choose which lpc1768 timer to use for us_ticker.c
39e4fc2
to
e5000ab
Compare
how does one force ci-* tests to go? |
Hi @thesupershan. Please refer to documentation on contributing to Mbed OS: https://os.mbed.com/docs/latest/reference/workflow.html In specific, the maintainers group are the only ones that have access to start CI, for a variety of reasons. At the moment, we're prioritizing 5.10.0-rc3 PRs since the 5.10 release is coming up, but once that is out of the way, we'll be working through the needs: CI backlog. |
got it, i thought they were automatic, thanks |
/morph build |
Build : SUCCESSBuild number : 3240 Triggering tests/morph test |
Test : FAILUREBuild number : 3048 |
/morph mbed2-build |
Will restart CI tests a bit later when the queue gets smaller |
/morph test |
/morph export-build |
Exporter Build : FAILUREBuild number : 2879 |
Test : SUCCESSBuild number : 3069 |
/morph export-build |
5 similar comments
/morph export-build |
/morph export-build |
/morph export-build |
/morph export-build |
/morph export-build |
@ARMmbed/mbed-os-test Any idea why our commands were being ignored? |
/morph export-build |
ಠ_ಠ |
Exporter Build : SUCCESSBuild number : 2943 |
@thesupershan 190803a is the actual commit that contains the code changes. The second commit is a merge commit that describes how two branches were brought together into one. Our release process cherry-picks PRs according to their label, ignoring merge commits in the process. |
Before it was edited, there was a mention about a bug on master? Is there any issue with this PR? |
Yes, the second commit (190803a) has bug of which kegilbert identified above. The merge commit does actually have a code change in it. Sorry if i messed the cherry-pick process, I wanted to squash the merge-commit but alas, they cannot be squashed. Looks like 5.11 got the e5000ab fix. So master and 5.11 are correct, but 5.10 is incorrect. |
Woah, that's incredibly subtle and frustrating. @0xc0170 Not master, but the 5.10 branch. The merge commit wasn't picked up in the release process, which left the lone fix behind. I'm really dissapointed at GitHub for not being able to indicate this single line change properly. @thesupershan Thanks for catching this. This will definitely need to be fixed with our release process. 5.11 doesn't have the problem because the branch was created by branching off of master, which does have merge commits. |
I am bit confused here, release tag says 5.10.2 -> It means it was merged after 5.10 was released. |
@thesupershan Will have to confirm Monday, since most of my cohorts are on the other side of the globe and it's the weekend already, but odds are since we're about to finish the release process for 5.11.0, this will remain as a known issue for 5.10. We're definitely going to look into updating our release process, and this gives us a test case to validate our updates. We don't want to discourage collaboration on the author's side of a PR :) @deepikabhavnani The problem appears to be that the script that we use to bring PRs from master into a PR for a given release is skipping merge commits. |
@cmonr, thanks for the digging, feedback and input, much appreciated! I have a work-around for 5.10 so i'm all set. |
@cmonr Is this issue being tracked anywhere? Please create an issue |
@0xc0170 Patch release process issue created. The LPC issue is not an issue for 5.11, and is a won't-fix for 5.10 since we don't have a process to backport problems in older releases. |
Description
Adding option for LPC1768 by which user can select which timer to use for us_ticker.c
LPC1768 has available timers: 0, 1, 2 and 3. The default uses the original coded timer: timer 3.
Pull request type