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

Travis CI: Tweak astyle to not over-exclude files #10166

Merged
merged 3 commits into from Mar 22, 2019

Conversation

Projects
None yet
3 participants
@cmonr
Copy link
Contributor

commented Mar 19, 2019

Description

Problem was originally reported in #10140.

It was found that the astyle job was skipping features/cellular/framework/targets.

Further investigation found that when astyle ignores a directory, it does so by string matching, which means that ignoring target also ignores */*/*/target*...

Appending './' to the astyleignore file allows the Travis CI job to not overly-exclude files.

Also, decided to sort the list.

Pull request type

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

Reviewers

Release Notes

@cmonr cmonr requested a review from ARMmbed/mbed-os-maintainers Mar 19, 2019

@cmonr

This comment has been minimized.

Copy link
Contributor Author

commented Mar 19, 2019

The follow files will stop being ignored:

usb/device/targets/TARGET_STM/USBPhy_STM32.cpp
usb/device/targets/TARGET_RENESAS/TARGET_RZ_A1XX/USBPhy_RZ_A1.cpp
usb/device/targets/TARGET_Template/USBPhy_template.cpp
usb/device/targets/TARGET_Freescale/USBPhy_Kinetis.cpp
usb/device/targets/TARGET_NXP/USBHAL_LPC17.cpp
features/cellular/framework/targets/TELIT/HE910/TELIT_HE910.cpp
features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP.cpp
features/cellular/framework/targets/UBLOX/N2XX/UBLOX_N2XX.cpp
features/cellular/framework/targets/UBLOX/N2XX/UBLOX_N2XX_CellularSMS.cpp
features/cellular/framework/targets/UBLOX/N2XX/UBLOX_N2XX_CellularStack.cpp
features/cellular/framework/targets/UBLOX/N2XX/UBLOX_N2XX_CellularContext.cpp
features/cellular/framework/targets/UBLOX/AT/UBLOX_AT.cpp
features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularStack.cpp
features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.cpp
features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularNetwork.cpp
features/cellular/framework/targets/GENERIC/GENERIC_AT3GPP/GENERIC_AT3GPP.cpp
features/cellular/framework/targets/MultiTech/DragonflyNano/PPP/SARA4_PPP.cpp
features/cellular/framework/targets/MultiTech/DragonflyNano/PPP/SARA4_PPP_CellularNetwork.cpp
features/cellular/framework/targets/GEMALTO/CINTERION/GEMALTO_CINTERION.cpp
features/cellular/framework/targets/GEMALTO/CINTERION/GEMALTO_CINTERION_CellularInformation.cpp
features/cellular/framework/targets/GEMALTO/CINTERION/GEMALTO_CINTERION_CellularContext.cpp
features/cellular/framework/targets/GEMALTO/CINTERION/GEMALTO_CINTERION_CellularStack.cpp
features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularNetwork.cpp
features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularInformation.cpp
features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_ControlPlane_netif.cpp
features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96.cpp
features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularContext.cpp
features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularStack.cpp
features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularInformation.cpp
features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularContext.cpp
features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularNetwork.cpp
features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95.cpp
features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularStack.cpp
features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26_CellularContext.cpp
features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26_CellularStack.cpp
features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26_CellularInformation.cpp
features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26.cpp
features/cellular/framework/targets/QUECTEL/UG96/QUECTEL_UG96.cpp
features/cellular/framework/targets/QUECTEL/UG96/QUECTEL_UG96_CellularContext.cpp
features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp
features/nanostack/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/main.cpp
features/nanostack/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/csnvmtest.cpp
features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mbed.cpp
features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp
@cmonr

This comment has been minimized.

Copy link
Contributor Author

commented Mar 19, 2019

Locally ran the followign command to fix the remaining repo issues.

find . -regex '.*\.\(c\|cpp\|h\|hpp\)' | fgrep -v -f .astyleignore \
| while read file; do astyle -n --options=.astylerc "${file}"; done

@cmonr cmonr force-pushed the cmonr:astyle-fix branch from d9823a2 to 3b4442f Mar 19, 2019

cmonr added some commits Mar 19, 2019

Added './' prefix to all directories in .astyleignore
This forces directory searching to not over-exclude files.

Also sorted the list, because it's nice.

@cmonr cmonr force-pushed the cmonr:astyle-fix branch from 211a65a to e7c2e66 Mar 20, 2019

@cmonr

This comment has been minimized.

Copy link
Contributor Author

commented Mar 20, 2019

Rebased.

@cmonr

This comment has been minimized.

Copy link
Contributor Author

commented Mar 20, 2019

CI started

@0xc0170
Copy link
Member

left a comment

Good one

@mbed-ci

This comment has been minimized.

Copy link

commented Mar 20, 2019

Test run: FAILED

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

Failed test jobs:

  • jenkins-ci/mbed-os-ci_exporter

@0xc0170 0xc0170 added needs: CI and removed needs: review labels Mar 21, 2019

@0xc0170

This comment has been minimized.

Copy link
Member

commented Mar 21, 2019

CI restarted

@0xc0170 0xc0170 added ready for merge and removed needs: CI labels Mar 21, 2019

@0xc0170 0xc0170 merged commit e7987a9 into ARMmbed:master Mar 22, 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 9143 cycles (-912 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
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.