greptilian logo

IRC log for #sourcefu, 2016-09-03

http://sourcefu.com

| Channels | #sourcefu index | Today | | Search | Google Search | Plain-Text | plain, newest first | summary

All times shown according to UTC.

Time S Nick Message
04:44 dotplus joined #sourcefu
06:17 sivoais pdurbin: you all are using merge commits, right? It looks like your release process does place tagging *after* doing the merge, so that seems right. <http://guides.dataverse.org/en/4.2.3/developers/making-releases.html>
06:21 sivoais > git checkout master
06:21 sivoais > git merge my-release-branch; # now HEAD is pointing at a merge commit
06:21 sivoais > git tag vX.Y.Z; # tag it
06:22 sivoais I know it isn't Java, but I use dzil on Perl projects and it has plugins that handle tagging and versioning automatically. They also check that the changelog has been edited.
06:23 sivoais It helps me make a release with some piece-of-mind.
11:27 pdurbin semiosis: one can definitely merge a tag onto a branch. Like you said, a tag is just a pointer to a commit.
11:29 pdurbin sivoais: what we say we do in those docs and what we actually do in practice has changed, mostly because I stopped doing all the merging and tagging at the command line. Now it's done via the GitHub web interface.
14:24 sivoais Mmmhmm. My issue with the GitHub interface is that it is very limited and can't handle every operation that Git users might want.
14:25 sivoais If automating it through the interface is really important, you could have a GitHub hook that does it for you.
14:27 sivoais It could be similar to the GitHub code review services that will only let you merge once certain conditions are met (*approved by X*, *passes these tests*, etc.)
14:43 pdurbin it's mostly about making it easy for others on the team to easily merge and tag via a gui rather than having them mess with the command line
15:09 sivoais If you can create a script that takes a branch name and a release number, then you might be able to wrap that into a service that does the release in one step.
18:20 pdurbin yeah

| Channels | #sourcefu index | Today | | Search | Google Search | Plain-Text | plain, newest first | summary

http://sourcefu.com