Skip to content

Commit a4c915e

Browse files
committed
chore: Don't run spotless on check jobs, it's already run as part of the spotless job
1 parent 552ae2b commit a4c915e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ test_published_artifacts:
420420
script:
421421
- *gitlab_base_ref_params
422422
- ./gradlew --version
423-
- ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PskipTests -PrunBuildSrcTests -PskipSpotless -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS
423+
- ./gradlew $GRADLE_TARGET -x spotlessCheck $GRADLE_PARAMS -PskipTests -PrunBuildSrcTests -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS
424424
after_script:
425425
- *cgroup_info
426426
- source .gitlab/gitlab-utils.sh

gradle/spotless.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ def buildDirectoryFiles = project.layout.buildDirectory.asFileTree
99

1010
spotless {
1111
if (rootProject.hasProperty('skipSpotless')) {
12+
project.logger.quiet("Retiring 'skipSpotless' property, prefer '-x spotlessCheck' or '-x spotlessApply' to exclude spotless tasks.")
1213
// Spotless in JDK 8 uses an older eclipse formatter, and it has a (flaky) bug crashing check_profiling.
1314
// We disable it in CI, since we have a job dedicated to spotless anyway.
1415
enforceCheck false

0 commit comments

Comments
 (0)