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.

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

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

Merged

Conversation

@t3chguy
Copy link
Collaborator

t3chguy commented Apr 21, 2017

fixes #3682

@ara4n

This comment has been minimized.

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

This comment has been minimized.

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
and also then consistent with electron versioning

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy t3chguy force-pushed the t3chguy:t3chguy/electron_version_inconsistency branch from 80c6a06 to 6367344 May 2, 2017
@t3chguy t3chguy closed this May 2, 2017
@t3chguy t3chguy reopened this May 2, 2017
@t3chguy

This comment has been minimized.

Copy link
Collaborator 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
Copy link
Member

dbkr left a comment

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

@dbkr dbkr merged commit 6013a3e into vector-im:develop May 5, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.