Skip to content

fix(deps): update clang-format dependency, re-shrinkwrap. - #2059

Closed
mprobst wants to merge 2 commits into
angular:masterfrom
mprobst:update-clang
Closed

mprobst wants to merge 2 commits into
angular:masterfrom
mprobst:update-clang

Conversation

@mprobst

@mprobst mprobst commented May 21, 2015

Copy link
Copy Markdown
Contributor

No description provided.

@mprobst
mprobst force-pushed the update-clang branch 5 times, most recently from a523065 to 5cbe9af Compare May 22, 2015 08:56
@vicb

vicb commented May 22, 2015

Copy link
Copy Markdown
Contributor

LGTM, I would not merge all the file change, it will cause conflicts with other pending PRs, could we postpone the re-formatting of everything ?

@mprobst

mprobst commented May 22, 2015

Copy link
Copy Markdown
Contributor Author

Then it'd break the build. And of course the in-flight PRs will add more changes that would need re-formatting; unless we expect to have zero PRs and nobody with a large CL locally at some point in time, we would never get this in, I think...

@vicb

vicb commented May 22, 2015

Copy link
Copy Markdown
Contributor

Then it'd break the build.

Ah yes...

I think we have too many in-flight PRs ATM. -1 to merge this now.

We should merge most in-flight PRs before converting the tests to TS. May be we can propose that everybody focus on merging in-flight PR Friday morning and then you can update/merge this & test can be TSified ?

@mprobst

mprobst commented May 22, 2015

Copy link
Copy Markdown
Contributor Author

I guess you're the better judge of that than I am, but overall I expect that waiting might just increase the effort in total.

@vicb

vicb commented May 22, 2015

Copy link
Copy Markdown
Contributor

I guess you're the better judge of that than I am

I don't know but what I can is that I lost half my day yesterday trying to rebase a PR after TSification (& the other half with the build system, hopefully I was able to work for the 3rd half) and I can say it's not really nice.

As we should merge all possible PRs before upgrading the tests, I think it's worth the wait. It can be quite fast if we can get 3/4 people to merge pending PRs.

@tbosch

tbosch commented May 22, 2015

Copy link
Copy Markdown
Contributor

I am rebasing it right now and will merge as soon as Travis says it is green.

@tbosch

tbosch commented May 22, 2015

Copy link
Copy Markdown
Contributor

See #2107

@tbosch

tbosch commented May 22, 2015

Copy link
Copy Markdown
Contributor

Just landed in master.

@tbosch tbosch closed this May 22, 2015
@naomiblack naomiblack added this to the M9: TypeScript and Build Stability milestone May 22, 2015
@mprobst
mprobst deleted the update-clang branch May 26, 2016 16:47
@angular-automatic-lock-bot

Copy link
Copy Markdown

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 8, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants