From 1346a305844983dd0162ca144fb1f46293c269ea Mon Sep 17 00:00:00 2001 From: Allan Brighton Date: Tue, 26 Nov 2024 14:30:52 +0100 Subject: [PATCH] Added sbt option -Dsbt.log.noformat=true --- .github/workflows/dev.yml | 8 ++++---- .github/workflows/release.yml | 12 ++++++------ jenkins/stil-nightly | 16 ++++++++-------- jenkins/stil-weekly | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 1c20ff25df..8d2ce6b304 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -31,12 +31,12 @@ jobs: - name: Tests run: | - sbt -DenableFatalWarnings=true -Dakka.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true 'csw-time/test:test' - sbt -DenableFatalWarnings=true -Dakka.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true -DdisableTimeTests 'test:test' + sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true -Dakka.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true 'csw-time/test:test' + sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true -Dakka.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true -DdisableTimeTests 'test:test' - name: Coverage Report run: | - sbt -DenableCoverage=true coverageReport + sbt -Dsbt.log.noformat=true -DenableCoverage=true coverageReport sbtn coverageAggregate - name: Generate RTM @@ -75,7 +75,7 @@ jobs: sbtn makeSite - name: Multi-Jvm Tests - run: sbt -DenableFatalWarnings=true -DgenerateStoryReport=true 'integration/multi-jvm:test' + run: sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true -DgenerateStoryReport=true 'integration/multi-jvm:test' - name: Generate RTM if: always() diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 43707b9fa2..47ac6ae451 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,12 +44,12 @@ jobs: - name: Unit and Component Tests run: | - sbt -DenableFatalWarnings=true -Dakka.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true 'csw-time/test:test' - sbt -DenableFatalWarnings=true -Dakka.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true -DdisableTimeTests 'test:test' + sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true -Dakka.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true 'csw-time/test:test' + sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true -Dakka.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true -DdisableTimeTests 'test:test' - name: Coverage Report run: | - sbt -DenableCoverage=true coverageReport + sbt -Dsbt.log.noformat=true -DenableCoverage=true coverageReport sbtn coverageAggregate - uses: actions/upload-artifact@v4 @@ -62,7 +62,7 @@ jobs: run: find . -type d -regex ".*js/target.*" | xargs rm -rf - name: Multi-Jvm Tests - run: sbt -DgenerateStoryReport=true integration/multi-jvm:test + run: sbt -Dsbt.log.noformat=true -DgenerateStoryReport=true integration/multi-jvm:test - name: Generate RTM if: always() @@ -80,7 +80,7 @@ jobs: run: sbtn makeSite - name: Github Release - run: sbt githubRelease + run: sbt -Dsbt.log.noformat=true githubRelease env: GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} @@ -90,7 +90,7 @@ jobs: chmod +x /tmp/.git-askpass git config --global user.email "actions@github.com" git config --global user.name "Github Action" - sbt clean ghpagesPushSite + sbt -Dsbt.log.noformat=true clean ghpagesPushSite env: RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }} GIT_ASKPASS: /tmp/.git-askpass diff --git a/jenkins/stil-nightly b/jenkins/stil-nightly index 23b5a3bda1..5171bf1359 100644 --- a/jenkins/stil-nightly +++ b/jenkins/stil-nightly @@ -19,9 +19,9 @@ pipeline { stage('Build') { steps { sh "cs java --jvm temurin:1.17.0 -version" - sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt clean" - sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt scalafmtCheck" - sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -DenableFatalWarnings=true ';set every Seq(scalafmtOnCompile := false); scalastyle; test:compile; multi-jvm:compile;'" + sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -Dsbt.log.noformat=true clean" + sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -Dsbt.log.noformat=true scalafmtCheck" + sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true ';set every Seq(scalafmtOnCompile := false); scalastyle; test:compile; multi-jvm:compile;'" } } @@ -29,15 +29,15 @@ pipeline { stage('Unit and Component Tests') { steps { // Run all tests except csw-time tests - sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -DenableFatalWarnings=true -Dakka.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true -DdisableTimeTests 'test:test'" + sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true -Dakka.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true -DdisableTimeTests 'test:test'" // Run csw-time module tests - sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -DenableFatalWarnings=true -Dakka.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true 'csw-time/test:test'" + sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true -Dakka.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true 'csw-time/test:test'" } post { always { - sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -DenableCoverage=true coverageReport" - sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt coverageAggregate" + sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -Dsbt.log.noformat=true -DenableCoverage=true coverageReport" + sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -Dsbt.log.noformat=true coverageAggregate" junit '**/target/test-reports/*.xml' publishHTML(target: [ allowMissing : true, @@ -54,7 +54,7 @@ pipeline { // These tests cover the scenario of multiple components in multiple containers on same machine. stage('Multi-Jvm Test') { steps { - sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -DenableFatalWarnings=true -DgenerateStoryReport=true 'integration/multi-jvm:test'" + sh "eval \$(cs java --jvm temurin:1.17.0 --env) && sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true -DgenerateStoryReport=true 'integration/multi-jvm:test'" } } diff --git a/jenkins/stil-weekly b/jenkins/stil-weekly index 49164a9e8b..7b28c835c7 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" } } }