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.

Sign up for GitHub

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

Jump to bottom

Move spotless check to separate build task #1946

Merged
merged 12 commits into from Jun 17, 2020
Merged

Move spotless check to separate build task #1946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7080dda
[Travis] Replace JDK 9/10 with 14
TimvdLippe Jun 15, 2020
6ceb726
Move spotless check to separate build task
TimvdLippe Jun 15, 2020
aede9a9
Do not upload to CodeCov for formatting changes
TimvdLippe Jun 15, 2020
60952f8
Upgrade to Gradle 6
TimvdLippe Jun 15, 2020
07e6a6a
Remove commented plugin
TimvdLippe Jun 15, 2020
e098079
Merge branch 'update-gradle-6' into reconfigure-travis
TimvdLippe Jun 15, 2020
f3e4584
Merge branch 'release/3.x' into reconfigure-travis
TimvdLippe Jun 16, 2020
f3657f4
Fix unresolved identifier in settings.gradle.kts
TimvdLippe Jun 16, 2020
39fa9b6
Move plugins block to the start of the file
TimvdLippe Jun 16, 2020
afa914d
Update .travis.yml
TimvdLippe Jun 17, 2020
4e04e76
Merge branch 'reconfigure-travis' into travis-spotless-fix
TimvdLippe Jun 17, 2020
4990c01
Update .travis.yml
TimvdLippe Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion .travis.yml
View file
Open in desktop
Expand Up @@ -34,8 +34,16 @@ matrix:
env: SKIP_RELEASE=true
- jdk: openjdk11
env: SKIP_RELEASE=true MOCK_MAKER=mock-maker-inline
# Run Spotless as a separate job on JDK 11 (which is required for google-java-format)
- jdk: openjdk11
name: "Verify code formatting with Spotless"
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.

# Do not upload a coverage report, as we don't run the tests for this job
after_success: true
- jdk: openjdk8
name: "Check reproducibility of jars"
script: ./check_reproducibility.sh
# Do not upload a coverage report, as we don't run the tests for this job
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.


branches:
Expand All @@ -53,7 +61,7 @@ script:
# We are using && below on purpose
# ciPerformRelease must run only when the entire build has completed
# This guarantees that no release steps are executed when the build or tests fail
- ./gradlew spotlessCheck && ./gradlew build idea -s && ./gradlew ciPerformRelease
- ./gradlew build idea -s && ./gradlew ciPerformRelease

after_success:
#Generates coverage report:
Expand Down
8 changes: 4 additions & 4 deletions settings.gradle.kts
View file
Open in desktop
@@ -1,3 +1,7 @@
plugins {
id("com.gradle.enterprise").version("3.3.4")
}

include("deprecatedPluginsTest",
"inline",
"extTest",
Expand Down Expand Up @@ -34,10 +38,6 @@ rootProject.children.forEach { project ->
}
}

plugins {
id("com.gradle.enterprise").version("3.3.4")
}

//Posting Build scans to https://scans.gradle.com
gradleEnterprise {
buildScan {
Expand Down