Format build-tools and build-tools-internal #78910
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Our spotless configuration wasn't applied to these directories. This has to happen from the root directory, otherwise any formatting errors makes the project unbuildable. Also remove the `paddedCell` stuff, we've never needed it.
pugnascotia
added
>enhancement
v8.0.0
:Delivery/Tooling
|
Pinging @elastic/es-delivery (Team:Delivery) |
pugnascotia
commented
Oct 11, 2021
mark-vieira
requested changes
Oct 11, 2021
build-tools-internal/src/main/groovy/elasticsearch.formatting.gradle
Outdated
Show resolved
Hide resolved
pugnascotia
commented
Oct 12, 2021
| // different copies of the formatted files, so that you can see how they | ||
| // differ and infer what is the problem. | ||
| // When applied to e.g. `:build-tools`, we need to modify the path to our config files | ||
| if (rootProject.file(importOrderPath).exists() == false) { |
There was a problem hiding this comment.
This doesn't feel ideal, any better ideas?
There was a problem hiding this comment.
I think it'd be better to move these config files to somewhere under build-conventions now.
There was a problem hiding this comment.
build conventions is the right place imo for that stuff.
pugnascotia
commented
Oct 12, 2021
pugnascotia
commented
Oct 12, 2021
pugnascotia
commented
Oct 12, 2021
|
@mark-vieira @breskeby this PR is now configuring formatter via a |
breskeby
requested changes
Oct 12, 2021
| // different copies of the formatted files, so that you can see how they | ||
| // differ and infer what is the problem. | ||
| // When applied to e.g. `:build-tools`, we need to modify the path to our config files | ||
| if (rootProject.file(importOrderPath).exists() == false) { |
build-conventions/src/main/groovy/elasticsearch.formatting.gradle
Outdated
Show resolved
Hide resolved
| // different copies of the formatted files, so that you can see how they | ||
| // differ and infer what is the problem. | ||
| // When applied to e.g. `:build-tools`, we need to modify the path to our config files | ||
| if (rootProject.file(importOrderPath).exists() == false) { |
There was a problem hiding this comment.
build conventions is the right place imo for that stuff.
build-conventions/src/main/groovy/elasticsearch.formatting.gradle
Outdated
Show resolved
Hide resolved
|
@breskeby I've converted the Groovy plugin to Java, and applied the precommit plugin. Everything looks good, apart from one thing - my |
pugnascotia
added a commit
that referenced
this pull request
Oct 14, 2021
Our spotless configuration wasn't being applied to `build-tools` and `build-tools-internal`. Move the Spotless configuration to a Java plugin in `build-conventions`, and apply it everywhere. This resulted in a lot more Java files being subject to formatting, so I added more exclusions to the list. Also remove the `paddedCell` stuff, we've never needed it.
|
Backported to |
breskeby
added a commit
to breskeby/elasticsearch
that referenced
this pull request
Oct 21, 2021
The spotless plugin applies the gradle base plugin which results in building all artifacts in the bwc projects when just running build. This is not intended and happened as part of work on elastic#78910 The correct fix is to not apply the base plugin in the spotless plugin IMO. We will work on getting that fix upstream to the third party gradle plugin Meanwhile we just ignore bwc projects for our formatting as they also have no source available anyhow.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Oct 21, 2021
The spotless plugin applies the gradle base plugin which results in building all artifacts in the bwc projects when just running build. This is not intended and happened as part of work on #78910 The correct fix is to not apply the base plugin in the spotless plugin IMO. We will work on getting that fix upstream to the third party gradle plugin Meanwhile we just ignore bwc projects for our formatting as they also have no source available anyhow. This fixes #79606 when backported to 7.x
breskeby
added a commit
to breskeby/elasticsearch
that referenced
this pull request
Oct 21, 2021
The spotless plugin applies the gradle base plugin which results in building all artifacts in the bwc projects when just running build. This is not intended and happened as part of work on elastic#78910 The correct fix is to not apply the base plugin in the spotless plugin IMO. We will work on getting that fix upstream to the third party gradle plugin Meanwhile we just ignore bwc projects for our formatting as they also have no source available anyhow. This fixes elastic#79606 when backported to 7.x
elasticsearchmachine
pushed a commit
that referenced
this pull request
Oct 21, 2021
The spotless plugin applies the gradle base plugin which results in building all artifacts in the bwc projects when just running build. This is not intended and happened as part of work on #78910 The correct fix is to not apply the base plugin in the spotless plugin IMO. We will work on getting that fix upstream to the third party gradle plugin Meanwhile we just ignore bwc projects for our formatting as they also have no source available anyhow. This fixes #79606 when backported to 7.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Our spotless configuration wasn't being applied to
build-toolsandbuild-tools-internal. Move the Spotless configuration to a Java plugin inbuild-conventions, and apply it everywhere.This resulted in a lot more Java files being subject to formatting, so I added more exclusions to the list.
Also remove the
paddedCellstuff, we've never needed it.