Skip to content

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

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

Merged
merged 3 commits into from
Mar 22, 2019

Conversation

cmonr
Copy link
Contributor

@cmonr cmonr 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
Copy link
Contributor Author

cmonr 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
Copy link
Contributor Author

cmonr 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

Cruz Monrreal II added 3 commits March 20, 2019 12:57
@cmonr
Copy link
Contributor Author

cmonr commented Mar 20, 2019

Rebased.

@cmonr
Copy link
Contributor Author

cmonr commented Mar 20, 2019

CI started

Copy link
Contributor

@0xc0170 0xc0170 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good one

@mbed-ci
Copy link

mbed-ci 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
Copy link
Contributor

0xc0170 commented Mar 21, 2019

CI restarted

@0xc0170 0xc0170 merged commit e7987a9 into ARMmbed:master Mar 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants