Remove sbtx usage

Replace by prior copy of `.jvmopts-ci` into `.jvmopts` which is the file sbt natively supports
This commit is contained in:
Jonas Chapuis 2023-01-02 14:46:04 +01:00 committed by Matthew de Detrich
parent f26dfd92a6
commit bb90185dcb
7 changed files with 52 additions and 16 deletions

View file

@ -36,16 +36,19 @@ jobs:
- name: Cache Coursier cache - name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0 uses: coursier/cache-action@v6.4.0
- name: Enable jvm-opts
run: cp .jvmopts-ci .jvmopts
# compile code instead of doing mima check (until we re-enable mima check) # compile code instead of doing mima check (until we re-enable mima check)
- name: Compile code - name: Compile code
run: sbtx -jvm-opts .jvmopts-ci "+~ ${{ matrix.scalaVersion }} Test/compile" run: sbt "+~ ${{ matrix.scalaVersion }} Test/compile"
# disable mima check until first pekko release is done # disable mima check until first pekko release is done
#- name: Report MiMa Binary Issues #- name: Report MiMa Binary Issues
# run: sbtx -jvm-opts .jvmopts-ci "+~ ${{ matrix.scalaVersion }} mimaReportBinaryIssues" # run: sbt "+~ ${{ matrix.scalaVersion }} mimaReportBinaryIssues"
#- name: Check correct MiMa filter directories #- name: Check correct MiMa filter directories
# run: sbtx -jvm-opts .jvmopts-ci checkMimaFilterDirectories # run: sbt checkMimaFilterDirectories
# comment out email actions until we have an email address to use (and we need to get INFRA to whitelist dawidd6/action-send-mail) # comment out email actions until we have an email address to use (and we need to get INFRA to whitelist dawidd6/action-send-mail)
#- name: Email on failure #- name: Email on failure

View file

@ -27,9 +27,12 @@ jobs:
- name: Cache Coursier cache - name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0 uses: coursier/cache-action@v6.4.0
- name: Enable jvm-opts
run: cp .jvmopts-ci .jvmopts
- name: Check headers - name: Check headers
run: |- run: |-
sbtx -jvm-opts .jvmopts-ci \ sbt \
-Dsbt.override.build.repos=false \ -Dsbt.override.build.repos=false \
-Dsbt.log.noformat=false \ -Dsbt.log.noformat=false \
headerCheckAll headerCheckAll
@ -52,9 +55,12 @@ jobs:
- name: Cache Coursier cache - name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0 uses: coursier/cache-action@v6.4.0
- name: Enable jvm-opts
run: cp .jvmopts-ci .jvmopts
- name: sbt validatePullRequest - name: sbt validatePullRequest
run: |- run: |-
sbtx -jvm-opts .jvmopts-ci \ sbt \
-Dpekko.mima.enabled=false \ -Dpekko.mima.enabled=false \
-Dpekko.test.multi-in-test=false \ -Dpekko.test.multi-in-test=false \
-Dpekko.test.timefactor=2 \ -Dpekko.test.timefactor=2 \

View file

@ -48,10 +48,13 @@ jobs:
- name: Cache Coursier cache - name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0 uses: coursier/cache-action@v6.4.0
- name: Enable jvm-opts
run: cp .jvmopts-ci .jvmopts
- name: Multi node test - name: Multi node test
run: | run: |
cat multi-node-test.hosts cat multi-node-test.hosts
sbtx -jvm-opts .jvmopts-ci \ sbt \
-Dpekko.test.timefactor=2 \ -Dpekko.test.timefactor=2 \
-Dpekko.actor.testkit.typed.timefactor=2 \ -Dpekko.actor.testkit.typed.timefactor=2 \
-Dpekko.test.tags.exclude=gh-exclude,timing \ -Dpekko.test.tags.exclude=gh-exclude,timing \
@ -132,10 +135,13 @@ jobs:
- name: Cache Coursier cache - name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0 uses: coursier/cache-action@v6.4.0
- name: Enable jvm-opts
run: cp .jvmopts-ci .jvmopts
- name: Multi node test with Artery Aeron UDP - name: Multi node test with Artery Aeron UDP
run: | run: |
cat multi-node-test.hosts cat multi-node-test.hosts
sbtx -jvm-opts .jvmopts-ci \ sbt \
-Dpekko.test.timefactor=2 \ -Dpekko.test.timefactor=2 \
-Dpekko.actor.testkit.typed.timefactor=2 \ -Dpekko.actor.testkit.typed.timefactor=2 \
-Dpekko.cluster.assert=on \ -Dpekko.cluster.assert=on \

View file

@ -26,9 +26,12 @@ jobs:
- name: Cache Coursier cache - name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0 uses: coursier/cache-action@v6.4.0
- name: Enable jvm-opts
run: cp .jvmopts-ci .jvmopts
- name: sbt akka-cluster-metrics/test - name: sbt akka-cluster-metrics/test
run: |- run: |-
sbtx -jvm-opts .jvmopts-ci \ sbt \
-Djava.security.egd=file:/dev/./urandom \ -Djava.security.egd=file:/dev/./urandom \
-Dpekko.test.sigar=true \ -Dpekko.test.sigar=true \
-Dpekko.cluster.assert=on \ -Dpekko.cluster.assert=on \
@ -95,10 +98,13 @@ jobs:
- name: Cache Coursier cache - name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0 uses: coursier/cache-action@v6.4.0
- name: Enable jvm-opts
run: cp .jvmopts-ci .jvmopts
- name: sbt ${{ matrix.command }} - name: sbt ${{ matrix.command }}
# note that this is not running any multi-jvm tests because multi-in-test=false # note that this is not running any multi-jvm tests because multi-in-test=false
run: |- run: |-
sbtx -jvm-opts .jvmopts-ci \ sbt \
-Djava.security.egd=file:/dev/./urandom \ -Djava.security.egd=file:/dev/./urandom \
-Dpekko.remote.artery.enabled=off \ -Dpekko.remote.artery.enabled=off \
-Dpekko.test.timefactor=2 \ -Dpekko.test.timefactor=2 \
@ -157,10 +163,13 @@ jobs:
- name: Cache Coursier cache - name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0 uses: coursier/cache-action@v6.4.0
- name: Enable jvm-opts
run: cp .jvmopts-ci .jvmopts
- name: Compile and Test - name: Compile and Test
# note that this is not running any multi-jvm tests because multi-in-test=false # note that this is not running any multi-jvm tests because multi-in-test=false
run: |- run: |-
sbtx -jvm-opts .jvmopts-ci \ sbt \
-Dpekko.cluster.assert=on \ -Dpekko.cluster.assert=on \
-Dpekko.log.timestamps=true \ -Dpekko.log.timestamps=true \
-Dpekko.test.timefactor=2 \ -Dpekko.test.timefactor=2 \
@ -194,7 +203,7 @@ jobs:
if: ${{ startsWith(matrix.jdkVersion, 'adopt@1.11') }} if: ${{ startsWith(matrix.jdkVersion, 'adopt@1.11') }}
run: |- run: |-
sudo apt-get install graphviz sudo apt-get install graphviz
sbtx -jvm-opts .jvmopts-ci \ sbt \
-Dpekko.genjavadoc.enabled=true \ -Dpekko.genjavadoc.enabled=true \
"+~ ${{ matrix.scalaVersion }} doc" "+~ ${{ matrix.scalaVersion }} doc"
@ -203,7 +212,7 @@ jobs:
if: ${{ startsWith(matrix.jdkVersion, 'adopt@1.11') }} if: ${{ startsWith(matrix.jdkVersion, 'adopt@1.11') }}
run: |- run: |-
sudo apt-get install graphviz sudo apt-get install graphviz
sbtx -jvm-opts .jvmopts-ci \ sbt \
-Dpekko.build.scalaVersion=${{ matrix.scalaVersion }} \ -Dpekko.build.scalaVersion=${{ matrix.scalaVersion }} \
"+~ ${{ matrix.scalaVersion }} publishLocal publishM2" "+~ ${{ matrix.scalaVersion }} publishLocal publishM2"
@ -248,10 +257,13 @@ jobs:
- name: Cache Coursier cache - name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0 uses: coursier/cache-action@v6.4.0
- name: Enable jvm-opts
run: cp .jvmopts-ci .jvmopts
- name: sbt ${{ matrix.command }} - name: sbt ${{ matrix.command }}
# note that this is not running any multi-jvm tests because multi-in-test=false # note that this is not running any multi-jvm tests because multi-in-test=false
run: |- run: |-
sbtx -jvm-opts .jvmopts-ci \ sbt \
-Djava.security.egd=file:/dev/./urandom \ -Djava.security.egd=file:/dev/./urandom \
-Dpekko.remote.artery.transport=aeron-udp \ -Dpekko.remote.artery.transport=aeron-udp \
-Dpekko.test.timefactor=2 \ -Dpekko.test.timefactor=2 \

View file

@ -45,10 +45,13 @@ jobs:
- name: Cache Coursier cache - name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0 uses: coursier/cache-action@v6.4.0
- name: Enable jvm-opts
run: cp .jvmopts-ci .jvmopts
- name: Compile and run tests on Scala 3 - name: Compile and run tests on Scala 3
# note that this is not running any multi-jvm tests (yet) because multi-in-test=false # note that this is not running any multi-jvm tests (yet) because multi-in-test=false
run: | run: |
sbtx -jvm-opts .jvmopts-ci \ sbt \
-Dpekko.log.timestamps=true \ -Dpekko.log.timestamps=true \
-Dpekko.test.timefactor=2 \ -Dpekko.test.timefactor=2 \
-Dpekko.actor.testkit.typed.timefactor=2 \ -Dpekko.actor.testkit.typed.timefactor=2 \

View file

@ -42,7 +42,10 @@ jobs:
- name: Cache Coursier cache - name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0 uses: coursier/cache-action@v6.4.0
- name: Enable jvm-opts
run: cp .jvmopts-ci .jvmopts
- name: Compile on Scala 3 - name: Compile on Scala 3
run: | run: |
sbtx -jvm-opts .jvmopts-ci \ sbt \
"+~ 3 ${{ matrix.command }}" "+~ 3 ${{ matrix.command }}"

View file

@ -26,9 +26,12 @@ jobs:
- name: Cache Coursier cache - name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0 uses: coursier/cache-action@v6.4.0
- name: Enable jvm-opts
run: cp .jvmopts-ci .jvmopts
- name: sbt test - name: sbt test
run: |- run: |-
sbtx -jvm-opts .jvmopts-ci \ sbt \
-Djava.security.egd=file:/dev/./urandom \ -Djava.security.egd=file:/dev/./urandom \
-Dpekko.cluster.assert=on \ -Dpekko.cluster.assert=on \
-Dpekko.test.timefactor=2 \ -Dpekko.test.timefactor=2 \