From 565a3698927285e56ad8d70d425009107c84083d Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 24 Mar 2025 16:30:31 -0700 Subject: [PATCH 1/4] Add baseline if found in project root --- src/main/java/rife/bld/extension/DetektOperation.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/rife/bld/extension/DetektOperation.java b/src/main/java/rife/bld/extension/DetektOperation.java index 8e3213e..39b93e7 100644 --- a/src/main/java/rife/bld/extension/DetektOperation.java +++ b/src/main/java/rife/bld/extension/DetektOperation.java @@ -545,6 +545,12 @@ public class DetektOperation extends AbstractProcessOperation { if (isNotBlank(baseline_)) { args.add("--baseline"); args.add(cleanPath(baseline_)); + } else { + var baseline = new File("detekt-baseline.xml"); + if (baseline.exists()) { + args.add("--baseline"); + args.add(cleanPath(baseline.getAbsolutePath())); + } } // build-upon-default-config From f0143c8ce43778558bfc6be18afeb9329c857924 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 24 Mar 2025 16:39:09 -0700 Subject: [PATCH 2/4] Change default baseline location to current dir --- src/main/java/rife/bld/extension/DetektOperation.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/rife/bld/extension/DetektOperation.java b/src/main/java/rife/bld/extension/DetektOperation.java index 39b93e7..26557ad 100644 --- a/src/main/java/rife/bld/extension/DetektOperation.java +++ b/src/main/java/rife/bld/extension/DetektOperation.java @@ -545,12 +545,6 @@ public class DetektOperation extends AbstractProcessOperation { if (isNotBlank(baseline_)) { args.add("--baseline"); args.add(cleanPath(baseline_)); - } else { - var baseline = new File("detekt-baseline.xml"); - if (baseline.exists()) { - args.add("--baseline"); - args.add(cleanPath(baseline.getAbsolutePath())); - } } // build-upon-default-config @@ -680,7 +674,7 @@ public class DetektOperation extends AbstractProcessOperation { @Override public DetektOperation fromProject(BaseProject project) { project_ = project; - var baseline = new File(project.workDirectory(), "detekt-baseline.xml"); + var baseline = new File("detekt-baseline.xml"); if (baseline.exists()) { baseline_ = baseline.getAbsolutePath(); } From 03184338a4e4a18e8e27d9414a2b96c24f51424b Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 24 Mar 2025 16:43:57 -0700 Subject: [PATCH 3/4] Revert "Change default baseline location to current dir" This reverts commit f0143c8ce43778558bfc6be18afeb9329c857924. --- src/main/java/rife/bld/extension/DetektOperation.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/rife/bld/extension/DetektOperation.java b/src/main/java/rife/bld/extension/DetektOperation.java index 26557ad..39b93e7 100644 --- a/src/main/java/rife/bld/extension/DetektOperation.java +++ b/src/main/java/rife/bld/extension/DetektOperation.java @@ -545,6 +545,12 @@ public class DetektOperation extends AbstractProcessOperation { if (isNotBlank(baseline_)) { args.add("--baseline"); args.add(cleanPath(baseline_)); + } else { + var baseline = new File("detekt-baseline.xml"); + if (baseline.exists()) { + args.add("--baseline"); + args.add(cleanPath(baseline.getAbsolutePath())); + } } // build-upon-default-config @@ -674,7 +680,7 @@ public class DetektOperation extends AbstractProcessOperation { @Override public DetektOperation fromProject(BaseProject project) { project_ = project; - var baseline = new File("detekt-baseline.xml"); + var baseline = new File(project.workDirectory(), "detekt-baseline.xml"); if (baseline.exists()) { baseline_ = baseline.getAbsolutePath(); } From da04b93dd873d19fb3decb2e610754f3c9abcaa0 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 24 Mar 2025 16:48:28 -0700 Subject: [PATCH 4/4] List examples working directory --- .github/workflows/bld.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index c97ab73..cc73fba 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -26,7 +26,9 @@ jobs: - name: Download dependencies [examples] working-directory: examples - run: ./bld download + run: + - dir + - ./bld download - name: Run Detekt [examples] working-directory: examples