From 1f27dbae972b108e2ac348e3b60af92ae1a9ade5 Mon Sep 17 00:00:00 2001 From: Allan Brighton Date: Tue, 26 Nov 2024 14:27:34 +0100 Subject: [PATCH] Added sbt option -Dsbt.log.noformat=true --- jenkins/stil-nightly | 12 ++++++------ jenkins/stil-weekly | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jenkins/stil-nightly b/jenkins/stil-nightly index b11f872c0..6642cc463 100644 --- a/jenkins/stil-nightly +++ b/jenkins/stil-nightly @@ -20,9 +20,9 @@ pipeline { steps { sh "cs java --jvm temurin:1.17.0 -version" sh "sbt scalafmtCheck" - sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt clean makeSite" - sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -DenableFatalWarnings=true ';set every Seq(scalafmtOnCompile := false); test:compile; multi-jvm:compile;'" - sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt publishLocal" + sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -Dsbt.log.noformat=true clean makeSite" + sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true ';set every Seq(scalafmtOnCompile := false); test:compile; multi-jvm:compile;'" + sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -Dsbt.log.noformat=true publishLocal" } } @@ -34,8 +34,8 @@ pipeline { post { always { - sh "sbt -DenableCoverage=true coverageReport" - sh "sbt coverageAggregate" + sh "sbt -Dsbt.log.noformat=true -DenableCoverage=true coverageReport" + sh "sbt -Dsbt.log.noformat=true coverageAggregate" junit testResults: '**/target/test-reports/*.xml', allowEmptyResults: true publishHTML(target: [ allowMissing : true, @@ -62,7 +62,7 @@ pipeline { stage('Multi-Jvm Test') { steps { - sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -DgenerateStoryReport=true esw-integration-test/multi-jvm:test" + sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -Dsbt.log.noformat=true -DgenerateStoryReport=true esw-integration-test/multi-jvm:test" } } } diff --git a/jenkins/stil-weekly b/jenkins/stil-weekly index 59c578a67..e1bc38cbb 100644 --- a/jenkins/stil-weekly +++ b/jenkins/stil-weekly @@ -18,7 +18,7 @@ pipeline { stage('Paradox Validate Links') { steps { - sh "sbt docs/paradoxValidateLinks" + sh "sbt -Dsbt.log.noformat=true docs/paradoxValidateLinks" } } }