From 1084be80ad9420930b6644f7c9b14e012cbd63f1 Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Sat, 16 Dec 2023 12:24:25 -0600 Subject: [PATCH] Upgrade cache action to v3 (#5326) * Upgrade cache action to v3 * Make unique cache names * Empty commit to run CI * Empty commit to re-run CI --- .github/workflows/Compile.yml | 8 ++++++++ .github/workflows/Linux_2.13_App_Chain_Core_Tests.yml | 4 ++-- .../workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml | 4 ++-- .github/workflows/Linux_2.13_Node_Tests.yml | 4 ++-- .github/workflows/Linux_2.13_RPC_Tests.yml | 4 ++-- .github/workflows/Mac_2.13_RPC_Tests.yml | 4 ++-- .github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml | 4 ++-- .github/workflows/PostgresTests.yml | 4 ++-- .github/workflows/Secp_Disabled_Tests.yml | 4 ++-- .github/workflows/TorTests.yml | 2 +- .github/workflows/Windows.yml | 2 +- 11 files changed, 26 insertions(+), 18 deletions(-) diff --git a/.github/workflows/Compile.yml b/.github/workflows/Compile.yml index 0bf91ba16e..041a5433fd 100644 --- a/.github/workflows/Compile.yml +++ b/.github/workflows/Compile.yml @@ -20,5 +20,13 @@ jobs: distribution: 'adopt' java-version: '17' cache: 'sbt' + - name: Cache + uses: actions/cache@v3 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-compile-cache - name: Compile and Check Formatting run: sbt -J-Xmx2g +test:compile scalafmtCheckAll 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 733065138b..340bc3e918 100644 --- a/.github/workflows/Linux_2.13_App_Chain_Core_Tests.yml +++ b/.github/workflows/Linux_2.13_App_Chain_Core_Tests.yml @@ -24,12 +24,12 @@ jobs: java-version: '17' cache: 'sbt' - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.ivy2/cache ~/.sbt ~/.bitcoin-s/binaries - key: ${{ runner.os }}-cache + key: ${{ runner.os }}-app-chain-core-tests-cache - name: run tests 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 3cba6a24d2..1ff515805f 100644 --- a/.github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml +++ b/.github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml @@ -22,12 +22,12 @@ jobs: java-version: '17' cache: 'sbt' - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.ivy2/cache ~/.sbt ~/.bitcoin-s/binaries - key: ${{ runner.os }}-cache + key: ${{ runner.os }}-keymanager-wallet-dlc-test-cache - name: run tests 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 55810558ef..35c1c33741 100644 --- a/.github/workflows/Linux_2.13_Node_Tests.yml +++ b/.github/workflows/Linux_2.13_Node_Tests.yml @@ -22,12 +22,12 @@ jobs: java-version: '17' cache: 'sbt' - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.ivy2/cache ~/.sbt ~/.bitcoin-s/binaries - key: ${{ runner.os }}-cache + key: ${{ runner.os }}-node-test-cache - name: run tests run: sbt -J-Xmx2g 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 92e1e3fb7f..f96d83abd0 100644 --- a/.github/workflows/Linux_2.13_RPC_Tests.yml +++ b/.github/workflows/Linux_2.13_RPC_Tests.yml @@ -22,12 +22,12 @@ jobs: java-version: '17' cache: 'sbt' - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.ivy2/cache ~/.sbt ~/.bitcoin-s/binaries - key: ${{ runner.os }}-cache + key: ${{ runner.os }}-rpc-tests-cache - name: run tests 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_RPC_Tests.yml b/.github/workflows/Mac_2.13_RPC_Tests.yml index 1cbf536e8b..96eaa6ad7e 100644 --- a/.github/workflows/Mac_2.13_RPC_Tests.yml +++ b/.github/workflows/Mac_2.13_RPC_Tests.yml @@ -22,12 +22,12 @@ jobs: java-version: '17' cache: 'sbt' - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.ivy2/cache ~/.sbt ~/.bitcoin-s/binaries - key: ${{ runner.os }}-cache + key: ${{ runner.os }}-rpc-tests-cache - name: run tests 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 0131326fd0..12b008db54 100644 --- a/.github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml +++ b/.github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml @@ -22,12 +22,12 @@ jobs: java-version: '17' cache: 'sbt' - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.ivy2/cache ~/.sbt ~/.bitcoin-s/binaries - key: ${{ runner.os }}-cache + key: ${{ runner.os }}-wallet-node-dlc-test-cache - name: run tests run: sbt coverage cryptoTestJVM/test coreTestJVM/test secp256k1jni/test appCommonsTest/test walletTest/test dlcWalletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test asyncUtilsTestJVM/test dlcOracle/coverageReport dlcOracle/coveralls dlcNodeTest/test appServerTest/test diff --git a/.github/workflows/PostgresTests.yml b/.github/workflows/PostgresTests.yml index abf889d82c..45fc0fcf41 100644 --- a/.github/workflows/PostgresTests.yml +++ b/.github/workflows/PostgresTests.yml @@ -26,12 +26,12 @@ jobs: java-version: '17' cache: 'sbt' - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.ivy2/cache ~/.sbt ~/.bitcoin-s/binaries - key: ${{ runner.os }}-cache + key: ${{ runner.os }}-postgres-cache - name: run tests run: sbt dbCommonsTest/test walletTest/test dlcWalletTest/test chainTest/test dlcOracleTest/test nodeTest/test diff --git a/.github/workflows/Secp_Disabled_Tests.yml b/.github/workflows/Secp_Disabled_Tests.yml index 899f11789d..c24a643d03 100644 --- a/.github/workflows/Secp_Disabled_Tests.yml +++ b/.github/workflows/Secp_Disabled_Tests.yml @@ -24,12 +24,12 @@ jobs: java-version: '17' cache: 'sbt' - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.ivy2/cache ~/.sbt ~/.bitcoin-s/binaries - key: ${{ runner.os }}-cache + key: ${{ runner.os }}-secp-disabled-cache - name: run tests run: sbt cryptoTestJVM/test coreTestJVM/test diff --git a/.github/workflows/TorTests.yml b/.github/workflows/TorTests.yml index 3ea28d9758..11462e71fc 100644 --- a/.github/workflows/TorTests.yml +++ b/.github/workflows/TorTests.yml @@ -24,7 +24,7 @@ jobs: java-version: '17' cache: 'sbt' - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.ivy2/cache diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml index 92c7b3e4f8..e21d9f1713 100644 --- a/.github/workflows/Windows.yml +++ b/.github/workflows/Windows.yml @@ -27,7 +27,7 @@ jobs: java-version: '17' cache: 'sbt' - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.ivy2/cache