Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Updating package.json file for 0.4.2 release #1049

Merged
merged 2 commits into from
Nov 16, 2015

Conversation

lirantal
Copy link
Member

@lirantal lirantal commented Nov 7, 2015

Preparing for 0.4.2 release, updating relevant files.

@lirantal lirantal self-assigned this Nov 7, 2015
@lirantal lirantal added this to the 0.4.2 milestone Nov 7, 2015
@lirantal lirantal mentioned this pull request Nov 7, 2015
3 tasks
@lirantal
Copy link
Member Author

lirantal commented Nov 7, 2015

@codydaig any other updates we need?

@codydaig
Copy link
Member

codydaig commented Nov 7, 2015

@lirantal Don't forget to update the bower.json.
Also, I would run the changelog and merge that in with this PR so it's in the release tag.

I would like to vote to make 0.4.x a branch after the release but before we start merging 0.5 stuff in. I think there's a lot of people that picked up 0.4 and if there's any bugs, it gives us the opportunity to fix those bugs and release patches.

The generator does need to be updated, however, it's on hold until @ilanbiala hashes out a refactor for the built in fs to use some other module. There's a bunch of work that we still need to do to the generator, but it's on hold over a discussion over using this.fsversus the built in fs.

@lirantal
Copy link
Member Author

lirantal commented Nov 7, 2015

@codydaig what is there to update in bower.js?
and are there specific arguments to provide to conventional-changelog to get it to create the changelog in our desired format?

@codydaig
Copy link
Member

codydaig commented Nov 7, 2015

@lirantal We must have removed it, but I swore there was a version in the bower.json as well. Glad it's gone now! :)

and I put the exact command that needs to get ran in the CONTRIBUTING.md document.

@lirantal
Copy link
Member Author

lirantal commented Nov 7, 2015

@codydaig I did run it as follows conventional-changelog -r 1 > CHANGELOG.md although git shows a great diff between the former and new file and I suspected that something was wrong. Maybe it's just spaces or something else.

@lirantal lirantal force-pushed the feature/prep-for-042-release branch from 19f2ccd to 8a2a07e Compare November 7, 2015 18:09
@ilanbiala
Copy link
Member

@lirantal it looks for all the commits between 2 tags, so you would have to tag 0.4.2 first and then rerun this and you should see it work.

@codydaig
Copy link
Member

codydaig commented Nov 9, 2015

@lirantal I will run the changelog today and make a PR to your branch for you. If there's something that I documented wrong, I will also correct that.

@codydaig
Copy link
Member

@lirantal @ilanbiala I made a PR to @lirantal's branch with the updated changelog.

@lirantal
Copy link
Member Author

Hey guys,
Was a bit busy with work, and some hackathon that was going on.

I'll get back to this really quick!

@lirantal lirantal force-pushed the feature/prep-for-042-release branch from 98e444b to b7180c8 Compare November 14, 2015 20:01
@lirantal
Copy link
Member Author

weird, no idea why it's having conflicts on this branch while I can merge it with my master branch.

@lirantal
Copy link
Member Author

had to merge from master to resolve conflicts.

## 0.4.2 (2015-11-11)


* bug(readme): Remove Broken Live Demo Link ([9bfb312](https://github.com/meanjs/mean/commit/9bfb312))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come these aren't being parsed out into a subheading?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

donnu, @codydaig ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lirantal clarified, it's fine for this.

@ilanbiala
Copy link
Member

@lirantal that's fine, just make sure to rebase and squash. I'm curious about why the changelog didn't come out with a subheading for bugs though. Ideas?

@codydaig
Copy link
Member

@ilanbiala It did, but I removed them since there was only one or two things that fell under bugs. It only works with the new style and since the new style wasn't implemented until the very end most commits don't fall under a heading.

@ilanbiala
Copy link
Member

Oh okay.

@lirantal lirantal force-pushed the feature/prep-for-042-release branch from 8a1f9be to b7180c8 Compare November 15, 2015 06:32
@lirantal lirantal force-pushed the feature/prep-for-042-release branch from b7180c8 to bcdb663 Compare November 15, 2015 06:44
@lirantal
Copy link
Member Author

@ilanbiala for whatever reason when I'm rebasing without a merge commit it is conflicting with master branch and we're unable to merge through Github. So I'll re-base again with a merge commit and merge for the 0.4.2 release.


For those who will be generating releases:
* Don't forget to update the changelog!
* `conventional-changelog -r 1`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have the proper CLI command that prepends it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is probably where the merge conflict is.

…042-release

Conflicts:
	CHANGELOG.md

Conflicts:
	CHANGELOG.md
@lirantal
Copy link
Member Author

I'll go ahead and merge as is with the merge-commit.

@codydaig
Copy link
Member

LGTM

lirantal added a commit that referenced this pull request Nov 16, 2015
Updating package.json file for 0.4.2 release
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants