Skip to content
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

Cellular: fix astyle for files that already in master #10140

Merged
merged 1 commit into from Mar 20, 2019

Conversation

Projects
None yet
6 participants
@jarvte
Copy link
Contributor

commented Mar 18, 2019

Description

Fix astyle for files that are already in master. When running astyle for branch before making a pull request, these files always pop. So making separate pr for fixing astyle for these files.

Pull request type

[X] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

Release Notes

@ciarmcom ciarmcom requested review from ARMmbed/mbed-os-maintainers Mar 18, 2019

@ciarmcom

This comment has been minimized.

Copy link
Member

commented Mar 18, 2019

@jarvte, thank you for your changes.
@ARMmbed/mbed-os-wan @ARMmbed/mbed-os-maintainers please review.

@0xc0170

This comment has been minimized.

Copy link
Member

commented Mar 18, 2019

Question, how these files got in ?

@jarvte

This comment has been minimized.

Copy link
Contributor Author

commented Mar 18, 2019

Question, how these files got in ?

That's what we were also wondering.

@cmonr

cmonr approved these changes Mar 19, 2019

Copy link
Contributor

left a comment

🎉

@cmonr

This comment has been minimized.

Copy link
Contributor

commented Mar 19, 2019

@jarvte Out of curiosity, what was the local command that you used to run astyle? Also, what do you get when you run astyle --version?

Checked the history and PRs that touched these files, and they appear to be fine, so now I'm really curious as well.

@cmonr

This comment has been minimized.

Copy link
Contributor

commented Mar 19, 2019

Will mull over this a bit more, but we can get this PR going.

There might be something a bit more subtle going on, but it's not critical since astyle issues can be fixed without too much trouble.

@cmonr

This comment has been minimized.

Copy link
Contributor

commented Mar 19, 2019

CI started

@mbed-ci

This comment has been minimized.

Copy link

commented Mar 19, 2019

Test run: SUCCESS

Summary: 13 of 13 test jobs passed
Build number : 1
Build artifacts

@cmonr cmonr added ready for merge and removed needs: CI labels Mar 19, 2019

@jarvte

This comment has been minimized.

Copy link
Contributor Author

commented Mar 19, 2019

@cmonr astyle version: Artistic Style Version 3.1
I run these in linux and in mbed-os root:

astyle -n --options=.astylerc --recursive features/cellular/*.cpp
astyle -n --options=.astylerc --recursive features/cellular/*.c
astyle -n --options=.astylerc --recursive features/cellular/*.h
@cmonr

This comment has been minimized.

Copy link
Contributor

commented Mar 19, 2019

Well, I've managed to reproduce the problem.

For some reason features/cellular/framework/targets is getting parsed into the exclude list. Will submit another PR to fix things, along with whatever else may be missing.

@cmonr

This comment has been minimized.

Copy link
Contributor

commented Mar 19, 2019

Fix will be coming in: #10166

@0xc0170 0xc0170 merged commit 23cd1aa into ARMmbed:master Mar 20, 2019

28 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins-ci/build-ARMC5 Success
Details
jenkins-ci/build-ARMC6 Success
Details
jenkins-ci/build-GCC_ARM Success
Details
jenkins-ci/build-IAR8 Success
Details
jenkins-ci/cloud-client-test Success
Details
jenkins-ci/dynamic-memory-usage RTOS ROM(+0 bytes) RAM(+0 bytes)
Details
jenkins-ci/exporter Success
Details
jenkins-ci/greentea-test Success
Details
jenkins-ci/mbed2-build-ARMC5 Success
Details
jenkins-ci/mbed2-build-ARMC6 Success
Details
jenkins-ci/mbed2-build-GCC_ARM Success
Details
jenkins-ci/mbed2-build-IAR8 Success
Details
jenkins-ci/unittests Success
Details
travis-ci/astyle Local astyle testing has passed
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/doxy-spellcheck Local doxy-spellcheck testing has passed
Details
travis-ci/events Passed, runtime is 10416 cycles (+87 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/include_check Local include_check testing has passed
Details
travis-ci/licence_check Local licence_check testing has passed
Details
travis-ci/littlefs Passed, code size is 8408B (+0.00%)
Details
travis-ci/psa-autogen Local psa-autogen testing has passed
Details
travis-ci/tools-py2.7 Local tools-py2.7 testing has passed
Details
travis-ci/tools-py3.5 Local tools-py3.5 testing has passed
Details
travis-ci/tools-py3.6 Local tools-py3.6 testing has passed
Details
travis-ci/tools-py3.7 Local tools-py3.7 testing has passed
Details

@cmonr cmonr referenced this pull request Mar 26, 2019

Merged

ESP8266: Country code API #9927

@jarvte jarvte deleted the jarvte:astyle_fixes branch Mar 29, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.