diff --git a/.github/workflows/Compile.yml b/.github/workflows/Compile.yml index 85b4ac1eeb..0798a167fa 100644 --- a/.github/workflows/Compile.yml +++ b/.github/workflows/Compile.yml @@ -31,4 +31,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-compile-cache - name: Compile and Check Formatting - run: sbt -J-Xmx4g +test:compile scalafmtCheckAll cryptoTestJVM/test coreTestJVM/test appServer/universal:packageBin oracleServer/universal:packageBin cli/universal:packageBin docs/mdoc + run: sbt +test:compile scalafmtCheckAll cryptoTestJVM/test coreTestJVM/test appServer/universal:packageBin oracleServer/universal:packageBin cli/universal:packageBin docs/mdoc diff --git a/.github/workflows/Linux_2.13_App_Chain_Core_Tests.yml b/.github/workflows/Linux_2.13_App_Chain_Core_Tests.yml index 14446c1bc7..f68362e6bb 100644 --- a/.github/workflows/Linux_2.13_App_Chain_Core_Tests.yml +++ b/.github/workflows/Linux_2.13_App_Chain_Core_Tests.yml @@ -32,4 +32,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-app-chain-core-tests-cache - name: run tests - run: sbt -J-Xmx4g coverage dbCommonsTest/test chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls cryptoTestJVM/test cryptoJVM/test cryptoJVM/coverageReport cryptoJVM/coverageAggregate cryptoJVM/coveralls coreTestJVM/test coreJVM/coverageReport coreJVM/coverageAggregate coreJVM/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test oracleServerTest/test lnurlTest/test + run: sbt coverage dbCommonsTest/test chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls cryptoTestJVM/test cryptoJVM/test cryptoJVM/coverageReport cryptoJVM/coverageAggregate cryptoJVM/coveralls coreTestJVM/test coreJVM/coverageReport coreJVM/coverageAggregate coreJVM/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test oracleServerTest/test lnurlTest/test diff --git a/.github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml b/.github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml index b0bdb7c53b..e91942793e 100644 --- a/.github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml +++ b/.github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml @@ -30,4 +30,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-keymanager-wallet-dlc-test-cache - name: run tests - run: sbt -J-Xmx4g coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls feeProviderTest/test walletTest/test dlcWalletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test asyncUtilsTestJVM/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls + run: sbt coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls feeProviderTest/test walletTest/test dlcWalletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test asyncUtilsTestJVM/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls diff --git a/.github/workflows/Linux_2.13_Node_Tests.yml b/.github/workflows/Linux_2.13_Node_Tests.yml index 65a2134e28..9d35711239 100644 --- a/.github/workflows/Linux_2.13_Node_Tests.yml +++ b/.github/workflows/Linux_2.13_Node_Tests.yml @@ -30,4 +30,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-node-test-cache - name: run tests - run: sbt -J-Xmx4g cryptoTestJS/test coreJS/test 'set scalaJSStage in Global := FullOptStage' cryptoTestJS/test coreJS/test asyncUtilsTestJS/test coverage nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcNodeTest/test + run: sbt cryptoTestJS/test coreJS/test 'set scalaJSStage in Global := FullOptStage' cryptoTestJS/test coreJS/test asyncUtilsTestJS/test coverage nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcNodeTest/test diff --git a/.github/workflows/Linux_2.13_RPC_Tests.yml b/.github/workflows/Linux_2.13_RPC_Tests.yml index 9c156953db..782695af54 100644 --- a/.github/workflows/Linux_2.13_RPC_Tests.yml +++ b/.github/workflows/Linux_2.13_RPC_Tests.yml @@ -30,4 +30,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-rpc-tests-cache - name: run tests - run: sbt -J-Xmx4g coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls lndRpcTest/test clightningRpcTest/test esploraTest/test + run: sbt coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls lndRpcTest/test clightningRpcTest/test esploraTest/test diff --git a/.github/workflows/Mac_2.13_Crypto_Core_AppServer_Tests.yml b/.github/workflows/Mac_2.13_Crypto_Core_AppServer_Tests.yml index eafd6cc5e1..86c16bf7f8 100644 --- a/.github/workflows/Mac_2.13_Crypto_Core_AppServer_Tests.yml +++ b/.github/workflows/Mac_2.13_Crypto_Core_AppServer_Tests.yml @@ -32,4 +32,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-wallet-node-dlc-test-cache - name: run tests - run: sbt -J-Xmx4g coverage cryptoTestJVM/test coreTestJVM/test secp256k1jni/test zmq/test appCommonsTest/test asyncUtilsTestJVM/test chainTest/test dlcNodeTest/test appServerTest/test + run: sbt coverage cryptoTestJVM/test coreTestJVM/test secp256k1jni/test zmq/test appCommonsTest/test asyncUtilsTestJVM/test chainTest/test dlcNodeTest/test appServerTest/test diff --git a/.github/workflows/Mac_2.13_RPC_Tests.yml b/.github/workflows/Mac_2.13_RPC_Tests.yml index 1ad43168ed..37572045d2 100644 --- a/.github/workflows/Mac_2.13_RPC_Tests.yml +++ b/.github/workflows/Mac_2.13_RPC_Tests.yml @@ -32,4 +32,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-rpc-tests-cache - name: run tests - run: sbt -J-Xmx4g coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls lndRpcTest/test esploraTest/test + run: sbt coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls lndRpcTest/test esploraTest/test diff --git a/.github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml b/.github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml index a16fe61003..12b14b7ae9 100644 --- a/.github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml +++ b/.github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml @@ -32,4 +32,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-wallet-node-dlc-test-cache - name: run tests - run: sbt -J-Xmx4g coverage walletTest/test dlcWalletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coveralls + run: sbt coverage walletTest/test dlcWalletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coveralls diff --git a/.github/workflows/PostgresTests.yml b/.github/workflows/PostgresTests.yml index afb51082a4..b1302fe651 100644 --- a/.github/workflows/PostgresTests.yml +++ b/.github/workflows/PostgresTests.yml @@ -34,4 +34,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-postgres-cache - name: run tests - run: sbt -J-Xmx4g dbCommonsTest/test walletTest/test dlcWalletTest/test chainTest/test dlcOracleTest/test nodeTest/test + run: sbt dbCommonsTest/test walletTest/test dlcWalletTest/test chainTest/test dlcOracleTest/test nodeTest/test diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml index 333e035533..9450c31799 100644 --- a/.github/workflows/Windows.yml +++ b/.github/workflows/Windows.yml @@ -35,5 +35,5 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: Windows Crypto, Core, and Database tests - run: sbt -J-Xmx4g cryptoTestJVM/test coreTestJVM/test secp256k1jni/test zmq/test appCommonsTest/test asyncUtilsTestJVM/test asyncUtilsTestJS/test appServerTest/test + run: sbt cryptoTestJVM/test coreTestJVM/test secp256k1jni/test zmq/test appCommonsTest/test asyncUtilsTestJVM/test asyncUtilsTestJS/test appServerTest/test shell: bash diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 6b52dc457c..2bd931bd8b 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -25,4 +25,4 @@ jobs: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Build and push - run: sbt -J-Xmx4g "oracleServer/docker:publish;appServer/docker:publish" \ No newline at end of file + run: sbt "oracleServer/docker:publish;appServer/docker:publish" \ No newline at end of file diff --git a/.github/workflows/native.yml b/.github/workflows/native.yml index 04e9c1c9cc..44c4720986 100644 --- a/.github/workflows/native.yml +++ b/.github/workflows/native.yml @@ -36,7 +36,7 @@ jobs: # from https://github.com/graalvm/graalvm-ce-builds/releases java-version: graalvm@21.0.2=tgz+https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_${{runner.os}}-x64_bin.tar.gz - run: git fetch --tags || true - - run: sbt -J-Xmx4g cli/nativeImage + - run: sbt cli/nativeImage shell: bash if: ${{ matrix.os != 'windows-latest' }} - run: echo $(pwd) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd229e1e6c..b1c0f248e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: java-version: '21.0.4' cache: 'sbt' - uses: olafurpg/setup-gpg@v3 - - run: sbt -J-Xmx4g ci-release docs/publishWebsite + - run: sbt ci-release docs/publishWebsite env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} PGP_SECRET: ${{ secrets.PGP_SECRET }} @@ -68,7 +68,7 @@ jobs: run: brew install sbt - name: Build all zips shell: bash # windows needs shell defined - run: sbt -J-Xmx4g "universal:stage;universal:packageBin" + run: sbt "universal:stage;universal:packageBin" - name: View Artifacts run: ls -l app/server/target/universal/stage # - name: Build appServer diff --git a/.jvmopts b/.jvmopts new file mode 100644 index 0000000000..806a6d382d --- /dev/null +++ b/.jvmopts @@ -0,0 +1,3 @@ +-Xms512M # Set minimum heap size +-Xmx4G # Set maximum heap size +-Xss2M # Set stack size to 2MB (needed for https://github.com/bitcoin-s/bitcoin-s/pull/5728)