Updated github actions, Added sbt option -Dsbt.log.noformat=true

tmtsoftware · Nov 26, 2024 · a252646 · a252646
1 parent 1ecfbb3
commit a252646
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
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
@@ -32,16 +32,16 @@ jobs:
       - name: Tests
         run: |
           sbt clean
-          sbt -DenableFatalWarnings=true -Dpekko.actor.serialize-messages=on -DenableCoverage=false -DgenerateStoryReport=false csw-time/Test/test
-          sbt -DenableFatalWarnings=true -Dpekko.actor.serialize-messages=on -DenableCoverage=false -DgenerateStoryReport=false -DdisableTimeTests Test/test
+          sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true -Dpekko.actor.serialize-messages=on -DenableCoverage=false -DgenerateStoryReport=false csw-time/Test/test
+          sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true -Dpekko.actor.serialize-messages=on -DenableCoverage=false -DgenerateStoryReport=false -DdisableTimeTests Test/test
 
 
   multi-jvm-tests:
     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
@@ -55,7 +55,7 @@ jobs:
           sbt makeSite
 
       - name: Multi-Jvm Tests
-        run: sbt -DenableFatalWarnings=true -DgenerateStoryReport=false integration/MultiJvm/test
+        run: sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true -DgenerateStoryReport=false integration/MultiJvm/test
 
   slack-success:
     needs: [ unit-tests, multi-jvm-tests ]

diff --git a/.github/workflows/masterLinkCheckAndMultiNICTest.yml b/.github/workflows/masterLinkCheckAndMultiNICTest.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: coursier/[email protected]
         with:
           jvm: temurin:1.17

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
     env:
       ESW_TS_VERSION: "0.4.1"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: coursier/[email protected]
         with:
           jvm: temurin:1.17
@@ -44,15 +44,15 @@ jobs:
 
       - name: Unit and Component Tests
         run: |
-          sbt -DenableFatalWarnings=true -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true 'csw-time/test:test'
-          sbt -DenableFatalWarnings=true -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true -DdisableTimeTests 'test:test'
+          sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true 'csw-time/test:test'
+          sbt -Dsbt.log.noformat=true -DenableFatalWarnings=true -Dpekko.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@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: Coverage Report
           path: target/scala-2.13/scoverage-report
@@ -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()
@@ -71,7 +71,7 @@ jobs:
 
       - name: Upload RTM
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: RTM
           path: target/RTM
@@ -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 "[email protected]"
           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
@@ -19,25 +19,25 @@ 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;'"
             }
         }
 
         // Component tests cover the scenario of multiple components in single container
         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 -Dpekko.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 -Dpekko.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 -Dpekko.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 -Dpekko.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
@@ -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 @@