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

Move spotless check to separate build task #1946

Merged
merged 12 commits into from Jun 17, 2020
Merged

Conversation

TimvdLippe
Copy link
Contributor

This means the tests can run in parallel of the formatting changes.
Therefore, formatting changes would not block obtaining your test
results, which should hopefully reduce the amount of Travis builds
necessary to work on a community PR.

This is also in preparation of #1934 which requires spotless to
run on JDK11 minimum.

9/10 are EOL since September 2018. 14 is the currently supported
Java version.
This means the tests can run in parallel of the formatting changes.
Therefore, formatting changes would not block obtaining your test
results, which should hopefully reduce the amount of Travis builds
necessary to work on a community PR.

This is also in preparation of #1934 which requires spotless to
run on JDK11 minimum.
This included a couple of breaking changes:
- The build plugin is now part of the Gradle Enterprise plugin
- The osgi plugin was removed, for which we have to use the bndtools
plugin instead
- Kotlin version has to be updated, including their coroutine
library versions

Gradle 6 is required for us to build on Java 14.

Supersedes and closes #1923
Copy link
Member

@mockitoguy mockitoguy left a comment

Choose a reason for hiding this comment

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

I'm good, just few questions.

@@ -28,6 +28,9 @@ matrix:
env: SKIP_RELEASE=true
- jdk: openjdk14
env: SKIP_RELEASE=true MOCK_MAKER=mock-maker-inline
- jdk: openjdk11
script: ./gradlew spotlessCheck
Copy link
Member

Choose a reason for hiding this comment

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

Does script: ./gradlew spotlessCheck mean that on openjdk11 we only run "spotlessCheck" task?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It means that we have 1 task that only runs spotless, and that task runs on opendjk11. We still have the other openjdk11 builds to verify that the tests pass etc... I will add a comment for clarification.

@@ -28,6 +28,9 @@ matrix:
env: SKIP_RELEASE=true
- jdk: openjdk14
env: SKIP_RELEASE=true MOCK_MAKER=mock-maker-inline
- jdk: openjdk11
script: ./gradlew spotlessCheck
after_success: true
Copy link
Member

Choose a reason for hiding this comment

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

What does after_success: true do here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

To make sure we don't run the coverage report task, since that's not what spotless generates. I will add a clarifying comment.

@TimvdLippe TimvdLippe changed the base branch from reconfigure-travis to release/3.x June 17, 2020 20:14
@TimvdLippe TimvdLippe merged commit e5a9da5 into release/3.x Jun 17, 2020
@TimvdLippe TimvdLippe deleted the travis-spotless-fix branch June 17, 2020 20:42
epeee pushed a commit to epeee/mockito that referenced this pull request Jun 22, 2020
This means the tests can run in parallel of the formatting changes.
Therefore, formatting changes would not block obtaining your test
results, which should hopefully reduce the amount of Travis builds
necessary to work on a community PR.

This is also in preparation of mockito#1934 which requires spotless to
run on JDK11 minimum.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants