Skip to content

Commit 6a0b1ed

Browse files
Youssefalaa7romani
authored andcommitted
Issue #18856: Split openrewrite-refaster-rules ci job into two jobs
1 parent 66b1f61 commit 6a0b1ed

3 files changed

Lines changed: 46 additions & 5 deletions

File tree

.ci/validation.sh

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,7 +1463,7 @@ openrewrite-checkstyle-auto-fix)
14631463
rm -rf /tmp/checkstyle-openrewrite-recipes
14641464
;;
14651465

1466-
openrewrite-refaster-rules)
1466+
openrewrite-refaster-rules-1)
14671467
echo "Cloning and building OpenRewrite recipes..."
14681468
PROJECT_ROOT="$(pwd)"
14691469
export MAVEN_OPTS="-Xmx4g -Xms2g"
@@ -1475,10 +1475,33 @@ openrewrite-refaster-rules)
14751475

14761476
cd "$PROJECT_ROOT"
14771477

1478-
echo "Running RefasterRules recipes..."
1478+
echo "Running RefasterRules Part 1 recipes..."
14791479
./mvnw -e --no-transfer-progress rewrite:run \
14801480
-Drewrite.recipeChangeLogLevel=INFO \
1481-
-Drewrite.activeRecipes=org.checkstyle.RefasterRules
1481+
-Drewrite.activeRecipes=org.checkstyle.RefasterRules1
1482+
1483+
echo "Checking for uncommitted changes..."
1484+
./.ci/print-diff-as-patch.sh target/rewrite.patch
1485+
1486+
rm -rf /tmp/checkstyle-openrewrite-recipes
1487+
;;
1488+
1489+
openrewrite-refaster-rules-2)
1490+
echo "Cloning and building OpenRewrite recipes..."
1491+
PROJECT_ROOT="$(pwd)"
1492+
export MAVEN_OPTS="-Xmx4g -Xms2g"
1493+
1494+
cd /tmp
1495+
git clone https://github.com/checkstyle/checkstyle-openrewrite-recipes.git
1496+
cd checkstyle-openrewrite-recipes
1497+
./mvnw -e --no-transfer-progress clean install -DskipTests
1498+
1499+
cd "$PROJECT_ROOT"
1500+
1501+
echo "Running RefasterRules Part 2 recipes..."
1502+
./mvnw -e --no-transfer-progress rewrite:run \
1503+
-Drewrite.recipeChangeLogLevel=INFO \
1504+
-Drewrite.activeRecipes=org.checkstyle.RefasterRules2
14821505

14831506
echo "Checking for uncommitted changes..."
14841507
./.ci/print-diff-as-patch.sh target/rewrite.patch

.circleci/config.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,15 @@ workflows:
319319
image-name: "cimg/openjdk:21.0"
320320
command: "./.ci/validation.sh openrewrite-checkstyle-auto-fix"
321321
- validate-with-maven-script:
322-
name: "openrewrite-refaster-rules"
322+
name: "openrewrite-refaster-rules-1"
323323
image-name: "cimg/openjdk:21.0"
324-
command: "./.ci/validation.sh openrewrite-refaster-rules"
324+
command: "./.ci/validation.sh openrewrite-refaster-rules-1"
325+
no_output_timeout: 15m
326+
- validate-with-maven-script:
327+
name: "openrewrite-refaster-rules-2"
328+
image-name: "cimg/openjdk:21.0"
329+
command: "./.ci/validation.sh openrewrite-refaster-rules-2"
330+
no_output_timeout: 15m
325331
- validate-with-maven-script:
326332
name: "openrewrite-static-analysis"
327333
image-name: "cimg/openjdk:21.0"

config/rewrite.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,25 @@ recipeList:
1919
type: specs.openrewrite.org/v1beta/recipe
2020
name: org.checkstyle.RefasterRules
2121
description: Picnic Refaster rules.
22+
recipeList:
23+
- org.checkstyle.RefasterRules1
24+
- org.checkstyle.RefasterRules2
25+
---
26+
type: specs.openrewrite.org/v1beta/recipe
27+
name: org.checkstyle.RefasterRules1
28+
description: Picnic Refaster rules - Part 1.
2229
recipeList:
2330
- tech.picnic.errorprone.refasterrules.BigDecimalRulesRecipes
2431
- tech.picnic.errorprone.refasterrules.CharSequenceRulesRecipes
2532
- tech.picnic.errorprone.refasterrules.ClassRulesRecipes
2633
- tech.picnic.errorprone.refasterrules.CollectionRulesRecipes
2734
- tech.picnic.errorprone.refasterrules.ComparatorRulesRecipes
2835
- tech.picnic.errorprone.refasterrules.FileRulesRecipes
36+
---
37+
type: specs.openrewrite.org/v1beta/recipe
38+
name: org.checkstyle.RefasterRules2
39+
description: Picnic Refaster rules - Part 2.
40+
recipeList:
2941
- tech.picnic.errorprone.refasterrules.MapRulesRecipes
3042
- tech.picnic.errorprone.refasterrules.MicrometerRulesRecipes
3143
- tech.picnic.errorprone.refasterrules.MockitoRulesRecipes

0 commit comments

Comments
 (0)