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

build(npm): Upgrade to Angular2@2.0.0-beta.7 #135

Closed
wants to merge 3 commits into from
Closed

build(npm): Upgrade to Angular2@2.0.0-beta.7 #135

wants to merge 3 commits into from

Conversation

JayKan
Copy link
Contributor

@JayKan JayKan commented Mar 8, 2016

Update to Angular2@2.0.0-beta.7. Also, bump rxjs@5.0.0-beta.2 and zone.js@0.5.15 to resolve siblings' peerDependencies requirements

traviskaufman and others added 2 commits March 2, 2016 15:06
This commit adds Dart gotchas for object destructuring, type aliases,
and tagged template literals, none of which are compilable by dart.
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for the commit author(s). If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.

1 similar comment
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for the commit author(s). If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.

@googlebot googlebot added the cla: no PR author must sign Google's Contributor License Agreement: https://opensource.google.com/docs/cla label Mar 8, 2016
@hansl
Copy link
Contributor

hansl commented Mar 8, 2016

Is this ready for review?

Considering Angular2 is now on beta.8 and will be on beta.9 tomorrow, could you at least push to beta 8? There's not really any features we want but it's always nice to make sure it works without regressions.

On a separate note, please rebase your branch as there are some document changes that should not appear in this PR.

Cheers :D

@JayKan
Copy link
Contributor Author

JayKan commented Mar 8, 2016

Hi @hansl,

I've updated to angular2@2.0.0-beta.8. All npm scripts were running success locally, however, I can see a build error from Travis CI, can't really reproduce the same error. Any ideas what's going on with this build error?

Build error: Timeout - Async callback was not invoked within timeout specified by jasmine.DEFAULT_TIMEOUT_INTERVAL.

Other than that, I think this is ready for review. Thanks for the quick reply, really appreciate your help and feedback.

Thanks,
Jay Kan

@hansl
Copy link
Contributor

hansl commented Mar 8, 2016

Okay. Start by smashing your commits into a single one using this guide: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html. We want to only have a single commit by PR.

We also need you to rebase everything on the latest master. I see you rebased your branch but not your master, so the diff shows changes that are not part of this PR.

Finally, you want to sign the CLA. This is required for any contributions with Google open source projects.

Once these things are done I'll approve it and merge it myself. Thanks for taknig the time for this!

build(npm): update to rxjs@5.0.0-beta.2 to resolve siblings' peerDependencies requirements

build(npm): update to zone.js@0.5.15 to resolve siblings' peerDependencies requirements

build(npm): Upgrade to Angular2@2.0.0-beta.8
@JayKan
Copy link
Contributor Author

JayKan commented Mar 8, 2016

So I've squashed my last 4 commits to one and I've also rebase my master branch as well.

Also, I've signed the CLA yesterday already not sure why I still need one. Please find attached screenshot for my CLA.

Please let me know if there's anything else I need to do, thanks!
cla

@hansl
Copy link
Contributor

hansl commented Mar 9, 2016

The problem is the CLA hasn't been signed for travis (on this PR). That's because you still have 3 commits.

Again, could you properly rebase on top of the master branch of this repo, and rebase your master on the master branch of this repo, to get rid of the 2 commits that are not relevant to this PR. If you need help I'm on gitter right now and can help you do it.

@hansl
Copy link
Contributor

hansl commented Mar 9, 2016

Oh I see what's going on. You're from an invalid branch state, where the merge commit from @traviskaufman wasn't removed. I had to force push master to fix this, and you apparently fetched the history for this branch while it was in an invalid state.

Could you do this PR again from a clean master? This could be fixed but for such a simple PR it's just better to redo it.

@hansl
Copy link
Contributor

hansl commented Mar 9, 2016

I'll close this now; just do a new PR for this and I'll LGTM it right away.

PS: you could also just branch off master, cherry pick your commit SHA, and create a new PR from this. If you don't know how, this is simple enough not to worry :)

@hansl hansl closed this Mar 9, 2016
@JayKan
Copy link
Contributor Author

JayKan commented Mar 9, 2016

Thanks for your quick reply @hansl, I'll do a new PR :)

@JayKan JayKan deleted the upgrade branch March 9, 2016 02:55
andrewseguin pushed a commit to andrewseguin/components that referenced this pull request Oct 15, 2018
* Updates all Angular dependencies to the latest RC.
* Fixes any errors/warnings caused by the upgrade.
* Fixes error when running the unit tests.
* Bumps the year in the license.
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 5, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla: no PR author must sign Google's Contributor License Agreement: https://opensource.google.com/docs/cla
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants