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

Remove CFSTORE VERSION file (colliding with an ARM 6.12 C++ header file) #10280

Merged
merged 1 commit into from Apr 1, 2019

Conversation

Projects
None yet
7 participants
@davidsaada
Copy link
Contributor

commented Mar 31, 2019

Description

This PR removes the "VERSION" file from the CFSTORE library, as it collides with a C++ header file having the same name, when compiling mbed-os with ARM 6.12 compiler.

Note that this is a temporary fix to resolve this compiler issue. #10258 should remove CFSTORE feature altogether in the next major release.

Pull request type

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

Reviewers

@SenRamakri

@ciarmcom ciarmcom requested review from SenRamakri and ARMmbed/mbed-os-maintainers Mar 31, 2019

@ciarmcom

This comment has been minimized.

Copy link
Member

commented Mar 31, 2019

@0xc0170

0xc0170 approved these changes Apr 1, 2019

@0xc0170

This comment has been minimized.

Copy link
Member

commented Apr 1, 2019

CI started while waiting for reviewers

@mbed-ci

This comment has been minimized.

Copy link

commented Apr 1, 2019

Test run: SUCCESS

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

@0xc0170

This comment has been minimized.

Copy link
Member

commented Apr 1, 2019

@SenRamakri As this is trival fix removing file not used, its ready for merge but still if you find time today to review, please do

@davidsaada

This comment has been minimized.

Copy link
Contributor Author

commented Apr 1, 2019

@SenRamakri As this is trival fix removing file not used, its ready for merge but still if you find time today to review, please do

Specifically, please check that it resolves the build problem with ARM 6.12, as I don't have this compiler installed.

@SenRamakri

This comment has been minimized.

Copy link
Collaborator

commented Apr 1, 2019

@0xc0170 - I have already verified. This is good to get in.

@cmonr cmonr merged commit 0d47e23 into ARMmbed:master Apr 1, 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 10346 cycles (+1174 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 removed the ready for merge label Apr 1, 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.