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

Versioning using GIT abbreviated commit ID #647

Merged
merged 1 commit into from
Nov 25, 2015
Merged

Versioning using GIT abbreviated commit ID #647

merged 1 commit into from
Nov 25, 2015

Conversation

smarek
Copy link
Member

@smarek smarek commented Nov 19, 2015

Using short form of current commit id and appending it to current, manifest defined, versionName

  • Edited reports to say if returning version code or name
> gradle assembleRelease -S
Starting a new Gradle Daemon for this build (subsequent builds will be faster).
Importing with getManifestVersionCode()
Returning version code 36
Importing with getManifestVersionName()
Returning version name 0.1.36-alpha-0747dc5

This closes #147

@smarek smarek added this to the v0.1.37-alpha milestone Nov 19, 2015
@smarek smarek self-assigned this Nov 19, 2015
@smarek
Copy link
Member Author

smarek commented Nov 19, 2015

This also removes need to change VersionName with provided PRs and commits, so that should easy up contribution cycle a bit

@SecUpwN
Copy link
Member

SecUpwN commented Nov 19, 2015

This also removes need to change VersionName with provided PRs and commits, so that should easy up contribution cycle a bit

Does it? I always changed that by hand to update our CHANGELOG properly. Does that change now?

@smarek
Copy link
Member Author

smarek commented Nov 19, 2015

Yes, you can refer to short commit ids in CHANGELOG to address that in similar manner imho

@SecUpwN
Copy link
Member

SecUpwN commented Nov 19, 2015

Yes, you can refer to short commit ids in CHANGELOG to address that in similar manner imho

Pretty neat change! But wouldn't that mean that I'd have to add a new entry in our CHANGELOG for every merged change in our repository? Sorry for asking so much, I'm just trying to find out how to do it later.

@smarek
Copy link
Member Author

smarek commented Nov 19, 2015

Well every Release should be tagged with appropriate repository version anyway, version prefix (ie. 0.1.36-alpha) doesn't change automatically, it's only the suffix -commitid which changes with repository changes.

This removes the need of step https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/wiki/Development-Status#versioning

Releasing manually versionCode when releasing is still needed. Name of release will be suffixed with commit-id from which it was built, so I'd recommend you to change versionCode, do a merge to master and then proceed with building Release APK

@SecUpwN
Copy link
Member

SecUpwN commented Nov 19, 2015

...so I'd recommend you to change versionCode, do a merge to master and then proceed with building Release APK

Ha, that's the way we're already doing it! Let's give it a shot, shall we, @He3556? ;-)

@smarek
Copy link
Member Author

smarek commented Nov 19, 2015

Want me to provide signing with config instructions through Gradle in separate PR for building releases?

@SecUpwN
Copy link
Member

SecUpwN commented Nov 24, 2015

Want me to provide signing with config instructions through Gradle in separate PR for building releases?

I have talked to @He3556 about this and both of us agree that this is not necessary since others are not intended to build signed releases, that's our job. Waiting for @He3556 to sign off the merge now. ;-)

SecUpwN added a commit that referenced this pull request Nov 25, 2015
Versioning using GIT abbreviated commit ID
@SecUpwN SecUpwN merged commit 5910cf3 into CellularPrivacy:development Nov 25, 2015
@smarek smarek deleted the git-versioning branch November 28, 2015 08:57
@SecUpwN
Copy link
Member

SecUpwN commented Dec 9, 2015

@larsgrefer, this work seems to have vanished with #652. Are you able to re-enable it for better tracking?

@larsgrefer
Copy link
Collaborator

@SecUpwN It currently depends on where you build, on travis and your local machine is everything okay. On buildozer git ist not installed

@SecUpwN
Copy link
Member

SecUpwN commented Dec 9, 2015

On buildozer git ist not installed

Ok, then it seems to be an Issue with Buildozer. Will contact them. Case closed. ;-)

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

Successfully merging this pull request may close these issues.

Build: Automatic version and app name update with Gradle
3 participants