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

Calculate versionNames from git-tags #730

Merged
merged 2 commits into from
Feb 21, 2016
Merged

Conversation

SecUpwN
Copy link
Member

@SecUpwN SecUpwN commented Dec 30, 2015

This pull request is aiming to calculate the versionName from git-tags. Before we can merge this, @ijansch needs to tell us here if the Issue with undetected git (stacktrace) has been resolved in Buildozer. @larsgrefer, would you please add a few arguments here why calculating them is better?

@larsgrefer
Copy link
Collaborator

The main argument for doing this is the dry principle. We already maintain our releases with their specific names with git tags and github releases. Without this we have to keep the git tags and the version in the build.gradle in sync manually. With this the build.gradle just uses the last or current git tag as version.

@SecUpwN
Copy link
Member Author

SecUpwN commented Jan 10, 2016

Just to let you guys know, I have emailed @ijansch several days ago to update us on the current status here, yet he did not reply. @buildozer can you tell us what the current state of fixing the git Issue is?

  • Update: The GIT-SHA is now correctly displayed. Buildozer seems to have worked it out.

@SecUpwN
Copy link
Member Author

SecUpwN commented Jan 12, 2016

@larsgrefer, since our Buidozer builds now correctly display the GIT-SHA in the About-Screen, do you think this pull request is ready to be merged? Or do is there more work needed for this to be completed?

@SecUpwN
Copy link
Member Author

SecUpwN commented Jan 21, 2016

@larsgrefer, are you ignoring me?

@larsgrefer
Copy link
Collaborator

I'm not sure about merging this PR because of #750

@SecUpwN
Copy link
Member Author

SecUpwN commented Jan 23, 2016

@larsgrefer, me neither. I am pretty sure that #682 will make our lives easier, yet I still have to manually release our normal flavour to Aptoide (they wanted to send me their API documentation a month ago, I'll ask again today). But regarding this PR, is there any other advantage other than that our build.gradle uses the last or current git tag as version? Is there a better way respecting #750?

@SecUpwN
Copy link
Member Author

SecUpwN commented Jan 25, 2016

Just found paperwork by @zsoltk. Please see if it is helpful here.

@larsgrefer
Copy link
Collaborator

paperwork is a nice idea, but does not solve #750

I've rebased this in order to resolve the merge conflicts and think we can merge it now

@SecUpwN
Copy link
Member Author

SecUpwN commented Jan 26, 2016

I've rebased this in order to resolve the merge conflicts and think we can merge it now

I guess I will then have to manually update the F-Droid versions, huh? :P

@larsgrefer
Copy link
Collaborator

@SecUpwN We already have to update the versions manually now

@SecUpwN
Copy link
Member Author

SecUpwN commented Jan 27, 2016

We already have to update the versions manually now

@larsgrefer, last question before I merge this: What will our version update procedure look like then?

@larsgrefer
Copy link
Collaborator

increase the versionCode and tag the commit

@larsgrefer larsgrefer closed this Feb 3, 2016
@SecUpwN
Copy link
Member Author

SecUpwN commented Feb 3, 2016

increase the versionCode and tag the commit

Thanks, @larsgrefer. Just for my own slow brain: That means when we push out a new version, I just have to write the CHANGELOG, push the changes via pull request to branch master and then create a new RELEASE with target master and then tag it properly like v0.1.39-alpha so that GitHub will properly increase our app versionName (and when #682 is merged also add the APK to the releases)?

  • UPDATE: Why did you just close this pull request, @larsgrefer? No need to freak out!

@larsgrefer
Copy link
Collaborator

@SecUpwN exactly

At the moment there is a little difference between the tag names and the versionName, because the tag is prefixed with v. Please let me update this PR to be able to honor this, before we merge it

@SecUpwN
Copy link
Member Author

SecUpwN commented Feb 3, 2016

Please let me update this PR to be able to honor this, before we merge it

Shall I re-open this pull request then, or do you plan to remove branch feature/autoVersion?

@larsgrefer
Copy link
Collaborator

I'll reopen it once its ready

@SecUpwN
Copy link
Member Author

SecUpwN commented Feb 3, 2016

I'll reopen it once its ready

I hope you'll never quit development on our app, even though we have so many open Issues, slow development and too few developers working to make this app come true. Thanks for your heart blood!

@larsgrefer larsgrefer reopened this Feb 5, 2016
@larsgrefer
Copy link
Collaborator

a tag named vfoobar will now result in a versionName foobar

@SecUpwN
Copy link
Member Author

SecUpwN commented Feb 7, 2016

a tag named vfoobar will now result in a versionName foobar

Why aren't we suing the v like we used to? I thought it was good like it is.

@SecUpwN
Copy link
Member Author

SecUpwN commented Feb 20, 2016

@larsgrefer, if you'd answer my question above and rebase this PR, I will certainly merge it now. :)

SecUpwN added a commit that referenced this pull request Feb 21, 2016
Calculate versionNames from git-tags
@SecUpwN SecUpwN merged commit 8f2881d into development Feb 21, 2016
@SecUpwN SecUpwN deleted the feature/autoVersion branch February 21, 2016 12:14
@SecUpwN
Copy link
Member Author

SecUpwN commented Feb 21, 2016

@larsgrefer, will https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/AIMSICD/build.gradle#L19 change automatically to the correct versio when I craft a new release on GitHub after having pushed all changes from branch development to branch master? I'm confused.

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.

None yet

2 participants