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

Wise 1510: fix a silent conflict with PR #5947 #5982

Merged
merged 1 commit into from Jan 31, 2018

Conversation

Projects
None yet
5 participants
@ithinuel
Member

ithinuel commented Jan 31, 2018

Description

PR #5947 requires some additional defines.
This PR completes #5904 and fixes the latent "conflict".

Status

READY

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Jan 31, 2018

/morph build

@0xc0170 0xc0170 added the needs: CI label Jan 31, 2018

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Jan 31, 2018

It's missing in the commit message how is this fixing it (what is actually in this PR, what I can guess from the actual changes, mbed added defines for this target were missing?)

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Jan 31, 2018

If this fixes the error, then #5977 can be closed. As soon as this gets green, will get in and the other closed

@mbed-ci

This comment has been minimized.

mbed-ci commented Jan 31, 2018

Build : SUCCESS

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

Triggering tests

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

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Jan 31, 2018

I can confirm this fixes the bug ! 👍

@mbed-ci

This comment has been minimized.

@orenc17

This comment has been minimized.

Contributor

orenc17 commented Jan 31, 2018

/morph uvisor-test

@mbed-ci

This comment has been minimized.

@0xc0170 0xc0170 merged commit 195b3ea into ARMmbed:master Jan 31, 2018

19 checks passed

ARM mbed CI Verification build successful.
Details
AWS-CI uVisor Build & Test Success
Details
ci-morph-build build completed
Details
ci-morph-exporter 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/docs Local docs testing has passed
Details
travis-ci/events Local events testing has passed
Details
travis-ci/littlefs Local littlefs testing has passed
Details
travis-ci/mbed2-ATMEL Local mbed2-ATMEL testing has passed
Details
travis-ci/mbed2-MAXIM Local mbed2-MAXIM testing has passed
Details
travis-ci/mbed2-NORDIC Local mbed2-NORDIC testing has passed
Details
travis-ci/mbed2-NUVOTON Local mbed2-NUVOTON testing has passed
Details
travis-ci/mbed2-NXP Local mbed2-NXP testing has passed
Details
travis-ci/mbed2-RENESAS Local mbed2-RENESAS testing has passed
Details
travis-ci/mbed2-SILICON_LABS Local mbed2-SILICON_LABS testing has passed
Details
travis-ci/mbed2-STM Local mbed2-STM testing has passed
Details
travis-ci/tools Local tools testing has passed
Details

@0xc0170 0xc0170 changed the title from fixes a silent conflict with PR #5947 to Wise 1510: fix a silent conflict with PR #5947 Jan 31, 2018

@mbed-ci

This comment has been minimized.

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Jan 31, 2018

I've just noticed the last run, that is default target, looks like an error (the previous run is actually valid, and looks all being tested)

@ithinuel ithinuel deleted the ithinuel:add-wise-1510 branch Jan 31, 2018

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