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

Merge duplicate keys in JSON. #8515

Merged
merged 1 commit into from Oct 24, 2018

Conversation

Projects
None yet
4 participants
@theotherjimmy
Contributor

theotherjimmy commented Oct 23, 2018

Description

I would love to make this an error, but we have had a duplicate key in
targets.json for a while now. Instead, we're merging in a semi-smart way.
This will allow you to have things like "target.features_add" twice, and
both will take affect.

Pull request type

[x] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change
Merge duplicate keys in JSON.
### Description

I would love to make this an error, but we have had a duplicate key in
`targets.json` for a while now. Instead, we're merging in a semi-smart way.
This will allow you to have things like `"target.features_add"` twice, and
both will take affect.

### Pull request type

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

cmonr approved these changes Oct 23, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented Oct 23, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Oct 23, 2018

Build : SUCCESS

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

Triggering tests

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

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@cmonr

This comment has been minimized.

Contributor

cmonr commented Oct 23, 2018

Job config fixed.
/morph test

@mbed-ci

This comment has been minimized.

@cmonr cmonr added ready for merge and removed needs: CI labels Oct 24, 2018

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Oct 24, 2018

I would love to make this an error, but we have had a duplicate key in
targets.json for a while now. Instead, we're merging in a semi-smart way.

logging warning at least so we start cleaning them up?

@0xc0170 0xc0170 merged commit 2fd95b0 into ARMmbed:master Oct 24, 2018

13 checks passed

ci-morph-build build completed
Details
ci-morph-exporter build completed
Details
ci-morph-mbed2-build build completed
Details
ci-morph-test test completed , RTOS ROM(+0 bytes) RAM(+0 bytes)
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, 677 files (+0 files)
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/events Passed, runtime is 9248 cycles (-718 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/licence_check Local licence_check testing has passed
Details
travis-ci/littlefs Passed, code size is 8372B (+0.00%)
Details
travis-ci/tools-py2.7 Local tools-py2.7 testing has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment