Switch from .jvmopts to .sbtopts

wavesplatform · Feb 6, 2025 · a9d9790 · a9d9790
1 parent a944988
commit a9d9790
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/check-pr.yaml b/.github/workflows/check-pr.yaml
@@ -17,7 +17,7 @@ jobs:
           gpg-passphrase: ${{ secrets.OSSRH_GPG_PASSPHRASE }}
       - uses: sbt/setup-sbt@v1
       - name: Check PR
-        run: sbt -J-Xlog:gc*=debug:file=./gc.log --mem 8096 --batch ";checkPR;completeQaseRun"
+        run: sbt -J-Xlog:gc*=debug:file=./gc.log --batch ";checkPR;completeQaseRun"
         env:
           QASE_ENABLE: true
           QASE_RUN_NAME: checkPR
@@ -56,7 +56,7 @@ jobs:
         run: |
           version=$(echo ${{ github.base_ref }} | awk -F '[-\.]' '{print $2"."$3}')
           pr_number=${{ github.event.number }}
-          sbt -Dproject.version=$version-$pr_number-SNAPSHOT --mem 4096 --batch publishSigned
+          sbt -Dproject.version=$version-$pr_number-SNAPSHOT --batch publishSigned
       - name: Save debug data
         uses: actions/upload-artifact@v4
         if: always()

diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml
@@ -35,7 +35,7 @@ jobs:
           java-version: '11'
           cache: 'sbt'
       - uses: sbt/setup-sbt@v1
-      - run: sbt --mem 4096 --batch buildTarballsForDocker
+      - run: sbt --batch buildTarballsForDocker
       - uses: docker/login-action@v3
         with:
           registry: ghcr.io

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -16,7 +16,7 @@ jobs:
           java-version: '11'
           cache: 'sbt'
       - uses: sbt/setup-sbt@v1
-      - run: sbt --mem 4096 --batch ';buildTarballsForDocker;buildRIDERunnerForDocker'
+      - run: sbt --batch ';buildTarballsForDocker;buildRIDERunnerForDocker'
       - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v3
         with:
@@ -131,4 +131,4 @@ jobs:
           SONATYPE_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           PGP_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSPHRASE }}
         run: |
-          sbt --mem 4096 --batch ";publishSigned;sonatypeBundleRelease"
+          sbt --batch ";publishSigned;sonatypeBundleRelease"
diff --git a/.github/workflows/push-default-branch.yml b/.github/workflows/push-default-branch.yml
@@ -40,4 +40,4 @@ jobs:
           PGP_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSPHRASE }}
         run: |
           version=$(awk -F '[".]' '{print $3"."$4"."$5+1}' version.sbt)-SNAPSHOT
-          sbt -Dproject.version=$version --mem 4096 --batch publishSigned
+          sbt -Dproject.version=$version --batch publishSigned
diff --git a/.jvmopts b/.jvmopts
diff --git a/.sbtopts b/.sbtopts
@@ -0,0 +1 @@
+-mem 4096
diff --git a/build-with-docker.sh b/build-with-docker.sh
@@ -7,4 +7,4 @@ docker run \
   -e HOME=/opt/sbt/home \
   -w /src \
   --rm -it wavesplatform/node-sbt-builder:$WAVES_VERSION \
-  /bin/sh -c "sbt --batch --mem 4096 packageAll"
+  /bin/sh -c "sbt --batch packageAll"
diff --git a/docker/node-sbt-builder.Dockerfile b/docker/node-sbt-builder.Dockerfile
@@ -14,4 +14,4 @@ VOLUME /src
 
 RUN git clone --depth 1 -b v$WAVES_VERSION https://github.com/wavesplatform/Waves.git /src && \
   cd /src && \
-  sbt --batch --mem 2048 ";node/compile;grpc-server/compile"
+  sbt --batch ";node/compile;grpc-server/compile"