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

Export folder needs to not ignore .mbed files. #6896

Merged
merged 1 commit into from May 22, 2018

Conversation

Projects
None yet
5 participants
@Alex-EEE
Contributor

Alex-EEE commented May 14, 2018

Description

Fixing a bug. .mbed is ignored in the high level .gitignore file. But .mbed is actually a needed file inside of tools/export. Even though the file is still in the main repo, since it's ignored now, you can easily lose it or remove it without seeing the change. Adding this .gitignore file here will add .mbed back into the tracked files for only this directory

Pull request type

[X ] Fix
[ ] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change
Export folder needs to not ignore .mbed files.
Fixing a bug.  .mbed is ignored in the high level .gitignore file.  But .mbed is actually a needed file inside of tools/export.  Even though the file is still in the main repo, since it's ignored now, you can easily lose it or remove it without seeing the change.  Adding this .gitignore file here will add .mbed back into the tracked files for only this directory

@0xc0170 0xc0170 requested review from cmonr and theotherjimmy May 15, 2018

@cmonr

cmonr approved these changes May 15, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented May 15, 2018

Interesting. Wondering why our export tests didn't catch this.
I'm also wondering what that .mbed file is used for since I only saw it referenced once in the entire repo, but I suppose that's a question for @theotherjimmy.

/morph build

@Alex-EEE

This comment has been minimized.

Contributor

Alex-EEE commented May 15, 2018

Your export test will probably pass b/c the .mbed got into the repository somehow, probably before .mbed was added to the root .gitignore. However you won't ever be able to change that .mbed file b/c going forward git will ignore any changes you make to it. I noticed this issue b/c I'm maintaining a local fork, and it somehow got deleted in one of my merges of the latest mbed-os. Then I tried to export, and the python script most definitely fails if it can't find that .mbed file.

@mbed-ci

This comment has been minimized.

mbed-ci commented May 15, 2018

Build : SUCCESS

Build number : 2027
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6896/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@theotherjimmy

Good by me.

@cmonr

This comment has been minimized.

Contributor

cmonr commented May 21, 2018

Relaunching test due to an earlier no-disk-space-left issue.

/morph test

@cmonr cmonr added needs: CI and removed needs: review labels May 21, 2018

@mbed-ci

This comment has been minimized.

@0xc0170 0xc0170 merged commit 261f73f into ARMmbed:master May 22, 2018

13 checks passed

AWS-CI uVisor Build & Test Success
Details
ci-morph-build build completed
Details
ci-morph-exporter build completed
Details
ci-morph-mbed2-build build completed
Details
ci-morph-test test completed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
travis-ci/astyle Passed, 845 warnings
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/events Passed, runtime is 9083 cycles (+33 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/littlefs Passed, code size is 9964B (+0.00%)
Details
travis-ci/tools Local tools testing has passed
Details

@cmonr cmonr removed the ready for merge label May 23, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment