Skip to content

Set mbed minor and patch version to 0 for master #4292

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 1 commit into from
May 15, 2017

Conversation

bulislaw
Copy link
Member

@bulislaw bulislaw commented May 9, 2017

Currently the MBED_VERSION on master is set to 5.2.1 and 5.0.123 which is confusing. I can see two ways of fixit that:

  • After we make a release we make a change on master to reflect the last released mbed version
  • We set it to 0 to avoid cofusion and set it to release version for release branch. @adbridge favors this solution.

One possible issue with second approach is if someone will get an idea of disabling/enabling features basing on MBED_VERSION macro in their app, not that it would work now very well, so maybe it's not a problem after all.

@bulislaw bulislaw self-assigned this May 9, 2017
@adbridge adbridge self-requested a review May 9, 2017 15:26
@0xc0170
Copy link
Contributor

0xc0170 commented May 9, 2017

rtos failes (see Travis log) , as it requires some version - this was added some time ago when we updated rtx to newer version. We can remove that check in rtos (this version of rtos will be replaced soon).

We discussed this some time ago but with no result. From me, I would favor the first one plus adding a a suffix. However that breaks the numbering system (something like 5.0.0devel - would increase only for every minor version (5.1.0devel, 5.2.0devel, etc))

cc @adbridge

@adbridge
Copy link
Contributor

adbridge commented May 9, 2017

Versioning is meaningless on master and nothing should be dependent on this on that branch. If RTOS on master expects a version then that is a bug in RTOS and we should address that there. I think this PR is the correct approach ....

So there is this :
#error "This version of RTOS requires mbed library version > 121"

We are now well past 121, can we not now drop this message ?

The proper version will be set for releases.
@bulislaw bulislaw force-pushed the fix_release_version branch from 49e894d to be0f65a Compare May 9, 2017 15:37
Copy link
Contributor

@adbridge adbridge left a comment

Choose a reason for hiding this comment

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

LGTM

@0xc0170
Copy link
Contributor

0xc0170 commented May 10, 2017

/morph test

@mbed-bot
Copy link

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 174

All builds and test passed!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants