Merges 2.0.0 into master for final release #106

sloum · 2019-12-01T03:31:20Z

sloum commented

2019-12-01 03:31:20 +00:00

This is the big one! I'm not sure we are at the 100% point, but I think we are really near it if we aren't at 100%. I figured I'd open the PR and we could discuss any last minute things that need to be done before this gets merged in.

@asdf I am not sure how to do this so that it gets tagged as the version (I have never used tags) and so that it gets set up as a release on tildegit. Any advice you have (or if you wanted to handle it) would be appreciated. Once it is merged in, tagged, and set up as a release I will build out the binaries, update the gopher and website, and close out issue #64 .

Then we can move on to trumpeting the release far and wide :-D

This is the big one! I'm not sure we are at the 100% point, but I think we are really near it if we aren't at 100%. I figured I'd open the PR and we could discuss any last minute things that need to be done before this gets merged in. @asdf I am not sure how to do this so that it gets tagged as the version (I have never used tags) and so that it gets set up as a release on tildegit. Any advice you have (or if you wanted to handle it) would be appreciated. Once it is merged in, tagged, and set up as a release I will build out the binaries, update the gopher and website, and close out issue #64 . Then we can move on to trumpeting the release far and wide :-D

sloum added this to the 2.0.0 milestone 2019-12-01 03:31:20 +00:00

sloum added the

release

label 2019-12-01 03:34:46 +00:00

asdf was assigned by sloum

2019-12-01 03:34:51 +00:00

asdf commented

2019-12-01 07:21:33 +00:00

New release 2.0.0 added. This created a tag associated with the latest commit. This should travel across when merged in to the main branch (but would like to confirm this after merging).

One small change is that the version string is now Bombadillo 2.0.0 - build ..., where it was previously Bombadillo v2.0.0 - build ...

This difference is due to the VERSION file containing v2.0.0. While the tag could be modified to v2.0.0, I don't feel it is necessary, but I'm happy to go with your choice on this.

For reference, tags can be added via the command line, but have to be pushed using git push origin tagname. I don't think it includes the release info text. I just used the releases tab on tildegit, as it is very straightforward. If there are changes they can be done there very easily.

Otherwise, I'm pretty happy with this result and don't see any other action required for this release to go in. It has been a lot of hard work and preparation to get to this point. You should feel proud! Please merge, at your convenience.

New release 2.0.0 added. This created a tag associated with the latest commit. This should travel across when merged in to the main branch (but would like to confirm this after merging). One small change is that the version string is now `Bombadillo 2.0.0 - build ...`, where it was previously `Bombadillo v2.0.0 - build ...` This difference is due to the VERSION file containing `v2.0.0`. While the tag could be modified to v2.0.0, I don't feel it is necessary, but I'm happy to go with your choice on this. For reference, tags can be added via the command line, but have to be pushed using `git push origin tagname`. I don't think it includes the release info text. I just used the releases tab on tildegit, as it is very straightforward. If there are changes they can be done there very easily. Otherwise, I'm pretty happy with this result and don't see any other action required for this release to go in. It has been a lot of hard work and preparation to get to this point. You should feel proud! Please merge, at your convenience.

sloum commented

2019-12-01 17:09:49 +00:00

Awesome! Thanks for the info about tags and releases :)

We should both be proud. You put in a lot of time and effort on this. It has been a team project for this release and I greatly appreciate your input, guidance, code, and organizational ability. This release would definitely not be as solid without them.

I am merging in now! I'll make the binaries after I get the baby down for a nap and comment when that is done. Maybe some basic testing should be done and then we can start telling people about it.

Awesome! Thanks for the info about tags and releases :) We should _both_ be proud. You put in a lot of time and effort on this. It has been a team project for this release and I greatly appreciate your input, guidance, code, and organizational ability. This release would definitely not be as solid without them. I am merging in now! I'll make the binaries after I get the baby down for a nap and comment when that is done. Maybe some basic testing should be done and then we can start telling people about it.

sloum closed this pull request

2019-12-01 17:10:03 +00:00

sloum commented

2019-12-01 17:12:09 +00:00

It is merged in! Everything looks good so far. The only odd thing I notice is that the releases page says how many commits to develop since the last release, whereas the first version says how many commits to master. I dont think this is a big deal, but it is something I noticed.

Trying to look at the diff temporarily crashed tildegit, lol. I was getting a blank page then a 404 before it finally worked and merged in.

It is merged in! Everything looks good so far. The only odd thing I notice is that the releases page says how many commits to develop since the last release, whereas the first version says how many commits to master. I dont think this is a big deal, but it is something I noticed. Trying to look at the diff temporarily crashed tildegit, lol. I was getting a blank page then a 404 before it finally worked and merged in.

sloum commented

2019-12-01 17:15:11 +00:00

I get the wrong bombadillo version when I run bombadillo -v :(

It displays: Bombadillo 1.0.0-196-gce3744a - build 2019-12-01T09:12-0800

I'm gonna wait on binaries until this gets worked out.

I get the wrong bombadillo version when I run `bombadillo -v` :( It displays: `Bombadillo 1.0.0-196-gce3744a - build 2019-12-01T09:12-0800` I'm gonna wait on binaries until this gets worked out.

sloum commented

2019-12-01 18:00:02 +00:00

I deleted the release and made a new one (off of master). It looks good when you look at the release, but it does not show correctly if you just pull master. It is still tagged 1.0.0 :( I'm not sure how to fix it.

sloum commented

2019-12-01 18:12:20 +00:00

Ok. Sorry for all the chatter here. I'm sure this is blowing up your email inbox :-/

I got it working. I had to delete the release, then create the tag locally, then push the tag:

git checkout master && git pull
git tag -a 2.0.0 [hash of the commit that merged everything into master]
git push origin 2.0.0

At that point I was able to re-create the release on tildegit with the 2.0.0 tag and it all seems to have worked. I cloned the repo into a new directory and was able to -v and get the right version.

Ok. Sorry for all the chatter here. I'm sure this is blowing up your email inbox :-/ I got it working. I had to delete the release, then create the tag locally, then push the tag: ``` git checkout master && git pull git tag -a 2.0.0 [hash of the commit that merged everything into master] git push origin 2.0.0 ``` At that point I was able to re-create the release on tildegit with the 2.0.0 tag and it all seems to have worked. I cloned the repo into a new directory and was able to `-v` and get the right version.

asdf commented

2019-12-01 20:06:54 +00:00

Thanks for sorting this out, sorry that it didn't work as directly as I thought it might!

I had to delete the tag on my system for this to appear correctly - git tag 2.0.0 --delete and git fetch --tags. If anyone else had previously pulled the old tag information they may need to do the same.

Thanks for sorting this out, sorry that it didn't work as directly as I thought it might! I had to delete the tag on my system for this to appear correctly - `git tag 2.0.0 --delete` and `git fetch --tags`. If anyone else had previously pulled the old tag information they may need to do the same.

sloum commented

2019-12-01 20:36:52 +00:00

Do you think we should update the documentation to have people pull the tag instead of master? I would think master should be fine (since everything that goes into master should have a tag whether it is a release or not).

Good to know about the re-pull of the tag info.

Do you think we should update the documentation to have people pull the tag instead of master? I would think master should be fine (since everything that goes into master should have a tag whether it is a release or not). Good to know about the re-pull of the tag info.

Sign in to join this conversation.

No reviewers