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.

Sign up for GitHub

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

Jump to bottom

Remove leading v in /version file, for SemVer and to match Electron ver #3683

Merged
merged 2 commits into from
May 5, 2017
Merged

Remove leading v in /version file, for SemVer and to match Electron ver #3683

merged 2 commits into from
May 5, 2017

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Apr 21, 2017

fixes #3682

@t3chguy t3chguy mentioned this pull request Apr 21, 2017
Merged
@ara4n
Copy link
Member

ara4n commented Apr 22, 2017

is there any chance that this breaks package.sh on electron? #3682 implies that there's some kind of link - and so we change the behaviour on riot-web without changing package.sh, i'm assuming bad stuff may happen?

@dbkr
Copy link
Member

dbkr commented Apr 26, 2017

I don't think so, although I'd prefer the other fix to be honest, ie. make getAppVersion() impls return semver compliant version strings and sort out in the package script where we're specifying the version (a semver string) and the tag ('v').

t3chguy added 2 commits May 2, 2017 21:32
@t3chguy
remove leading v in /version file so its semver
61c338a 
and also then consistent with electron versioning

Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy
tidy and fix flow notation
6367344 
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy t3chguy mentioned this pull request May 2, 2017
Merged
@t3chguy t3chguy closed this May 2, 2017
@t3chguy t3chguy reopened this May 2, 2017
@t3chguy
Copy link
Member Author

t3chguy commented May 2, 2017

@dbkr PTAL (closed and reopened to trigger a rebuild)

@t3chguy t3chguy changed the title Prepend version in Electron with a v to match versioning on the webapp Remove leading v in /version file, for SemVer and to match Electron ver May 3, 2017
dbkr
dbkr approved these changes May 5, 2017
View reviewed changes
Copy link
Member

@dbkr dbkr left a comment

Choose a reason for hiding this comment

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

Yeah, I think this makes our version strings a bit more consistent.

@dbkr dbkr merged commit 6013a3e into element-hq:develop May 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbkr dbkr dbkr approved these changes

Assignees

@t3chguy t3chguy

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Inconsistent prepend to riot-web Version Electron/Web
3 participants
@t3chguy @ara4n @dbkr