Merge remote-tracking branch 'origin/branch-0.6.x' into branch-0.6.x

tmtsoftware · Dec 28, 2024 · 01b2971 · 01b2971
2 parents 31a5a08 + b9b7f67
commit 01b2971
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/branchLinkCheck.yml b/.github/workflows/branchLinkCheck.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: branch-0.3.x
-      - uses: coursier/setup-action@v1
+      - uses: coursier/setup-action@v1.2.0-M2
         with:
           jvm: temurin:1.17
       - uses: coursier/cache-action@v6

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -17,8 +17,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: coursier/setup-action@v1
+      - uses: actions/checkout@v4
+      - uses: coursier/setup-action@v1.2.0-M2
         with:
           jvm: temurin:1.17
           apps: sbt
@@ -36,19 +36,19 @@ jobs:
 
       - name: Build
         run: |
-          sbt clean
-          sbt scalafmtCheck
-          sbt -DenableFatalWarnings=true makeSite
-          sbt publishLocal
+          sbt -Dsbt.log.noformat=true clean
+          sbt -Dsbt.log.noformat=true scalafmtCheck
+          sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true makeSite
+          sbt -Dsbt.log.noformat=true publishLocal
 
       - name: Unit Tests
-        run: sbt -Dpekko.actor.serialize-messages=on -DenableCoverage=false -DgenerateStoryReport=false -DdisableIntegrationTests test:test
+        run: sbt -Dsbt.log.noformat=true -Dpekko.actor.serialize-messages=on -DenableCoverage=false -DgenerateStoryReport=false -DdisableIntegrationTests test:test
 
       - name: Integration Tests
-        run: sbt -Dpekko.actor.serialize-messages=on -DenableCoverage=false -DgenerateStoryReport=false esw-integration-test/test:test
+        run: sbt -Dsbt.log.noformat=true -Dpekko.actor.serialize-messages=on -DenableCoverage=false -DgenerateStoryReport=false esw-integration-test/test:test
 
       - name: Multi-Jvm Tests
-        run: sbt -DgenerateStoryReport=false esw-integration-test/multi-jvm:test
+        run: sbt -Dsbt.log.noformat=true -DgenerateStoryReport=false esw-integration-test/multi-jvm:test
 
       - name: Notify slack
         if: always()

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,8 +12,8 @@ jobs:
       CSW_VERSION: "5726045"
       ESW_OCS_ENG_UI_VERSION: "0.3.1.TODO"
     steps:
-      - uses: actions/checkout@v3
-      - uses: coursier/setup-action@v1
+      - uses: actions/checkout@v4
+      - uses: coursier/setup-action@v1.2.0-M2
         with:
           jvm: temurin:1.17
           apps: sbt sbtn
@@ -51,11 +51,11 @@ jobs:
           sbt -DenableFatalWarnings=true makeSite
 
       - name: Tests
-        run: sbt -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true test:test
+        run: sbt -Dsbt.log.noformat=true -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true test:test
 
       - name: Coverage Report
         run: |
-          sbt -DenableCoverage=true coverageReport
+          sbt -Dsbt.log.noformat=true -DenableCoverage=true coverageReport
           sbtn coverageAggregate
 
       - name: Upload Coverage Report

diff --git a/jenkins/stil-nightly b/jenkins/stil-nightly
@@ -20,22 +20,22 @@ 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"
             }
         }
 
         stage('Test') {
 
             steps {
-                sh "eval \$(cs java --jvm temurin:1.17.0 --env) && source /var/lib/jenkins/.sdkman/bin/sdkman-init.sh && sbt -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true test:test"
+                sh "eval \$(cs java --jvm temurin:1.17.0 --env) && source /var/lib/jenkins/.sdkman/bin/sdkman-init.sh && sbt -Dsbt.log.noformat=true -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true test:test"
             }
 
             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
@@ -18,7 +18,7 @@ pipeline {
 
         stage('Paradox Validate Links') {
             steps {
-                sh "sbt docs/paradoxValidateLinks"
+                sh "sbt -Dsbt.log.noformat=true docs/paradoxValidateLinks"
             }
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ pipeline { @@
             stage('Paradox Validate Links') {
                 steps {
-                    sh "sbt docs/paradoxValidateLinks"
+                    sh "sbt -Dsbt.log.noformat=true docs/paradoxValidateLinks"
                 }
             }
         }
@@ Expand Down @@