Skip to content
This repository was archived by the owner on Dec 10, 2020. It is now read-only.

merge the latest state from upstream#20

Closed
dirk-thomas wants to merge 597 commits intomasterfrom
uncrustify_master
Closed

merge the latest state from upstream#20
dirk-thomas wants to merge 597 commits intomasterfrom
uncrustify_master

Conversation

@dirk-thomas
Copy link
Copy Markdown

@dirk-thomas dirk-thomas commented Feb 27, 2018

Pulling in half a year of bug fixes and improvements.

CI builds only running the uncrustify linter tests:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

Ready for "review".

CDanU and others added 30 commits December 18, 2017 16:26
- adopt to changes in emscripten-core/emscripten#5892
- set the version to C++11
- update the interface itself
This is also a better fix for uncrustify#1041
Thanks to @aneesh1127
Thanks to KalyanaChakravarthi
that is the place where it belongs and is actually used
frm.level is not used anywhere in indent.cpp
Thanks to KalyanaChakravarthi.
Thanks to Aneesh Gandavarapu.
update ChangeLog
Thanks to KalyanaChakravarthi
Thanks to KalyanaChakravarthi
Thanks to satish puppala
@dirk-thomas dirk-thomas added the in review Waiting for review (Kanban column) label Feb 27, 2018
@dirk-thomas dirk-thomas self-assigned this Feb 27, 2018
@dirk-thomas
Copy link
Copy Markdown
Author

dirk-thomas commented Feb 28, 2018

One of the CI parameters is wrong so the results are not valid. Waiting for another round (and likely style related PRs) before putting this back in review...

@dirk-thomas dirk-thomas added in progress Actively being worked on (Kanban column) and removed in review Waiting for review (Kanban column) labels Feb 28, 2018
@dirk-thomas
Copy link
Copy Markdown
Author

dirk-thomas commented Feb 28, 2018

Waiting for a regression to be addressed upstream before we can use the latest version: see uncrustify#1646.

Build Status

@dirk-thomas
Copy link
Copy Markdown
Author

With this configuration change I was able to work around the remaining differences: Build Status

@dirk-thomas dirk-thomas added in review Waiting for review (Kanban column) and removed in progress Actively being worked on (Kanban column) labels Feb 28, 2018
@dirk-thomas
Copy link
Copy Markdown
Author

dirk-thomas commented Feb 28, 2018

Even though all CI builds running the uncrustify tests pass I will close this in favor of an upcoming PR (#21) targeting the latest release of uncrustify.

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@dirk-thomas dirk-thomas removed the in review Waiting for review (Kanban column) label Feb 28, 2018
@dirk-thomas dirk-thomas mentioned this pull request Feb 28, 2018
@dirk-thomas dirk-thomas deleted the uncrustify_master branch February 28, 2018 20:06
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants