From a252646dd87fa3105429e3bce57102ad629cc2fd Mon Sep 17 00:00:00 2001 From: Allan Brighton Date: Tue, 26 Nov 2024 14:42:30 +0100 Subject: [PATCH] Updated github actions, Added sbt option -Dsbt.log.noformat=true --- .github/workflows/dev.yml | 14 +++++++------- .../masterLinkCheckAndMultiNICTest.yml | 2 +- .github/workflows/release.yml | 18 +++++++++--------- jenkins/stil-nightly | 16 ++++++++-------- jenkins/stil-weekly | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 3b5944d27f..2a856251b1 100644 --- 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 index 20c41683c1..4a4eb40d2c 100644 --- 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/setup-action@v1.2.0-M2 with: jvm: temurin:1.17 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b0ceaa740..e8e966dd27 100644 --- 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/setup-action@v1.2.0-M2 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 "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 f356527aa8..bb33bd590a 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 -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 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" } } }