From 2968a9ee15bcf91abaaf269d54134cab4b187cf9 Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Fri, 8 Jul 2022 13:43:17 -0500 Subject: [PATCH] Try to test out setup-java CI action (#4466) * Try to test out setup-java CI action * Attempt to fix --- .github/workflows/Compile.yml | 14 ++++---------- .github/workflows/Docs.yml | 6 ++++-- .../Linux_2.12_App_Chain_Core_Tests.yml | 6 ++++-- .../Linux_2.12_KeyManager_Wallet_DLC_Tests.yml | 6 ++++-- .github/workflows/Linux_2.12_Node_Tests.yml | 6 ++++-- .github/workflows/Linux_2.12_RPC_Tests.yml | 6 ++++-- .../Linux_2.13_App_Chain_Core_Tests.yml | 6 ++++-- .../Linux_2.13_KeyManager_Wallet_DLC_Tests.yml | 6 ++++-- .github/workflows/Linux_2.13_Node_Tests.yml | 6 ++++-- .github/workflows/Linux_2.13_RPC_Tests.yml | 6 ++++-- .github/workflows/Linux_2.13_ScalaJS_Tests.yml | 6 ++++-- .github/workflows/Mac_2.13_RPC_Tests.yml | 6 ++++-- .../Mac_2.13_Wallet_Node_DLC_Tests.yml | 6 ++++-- .github/workflows/PostgresTests.yml | 6 ++++-- .github/workflows/Secp_Disabled_Tests.yml | 6 ++++-- .github/workflows/TorTests.yml | 6 ++++-- .github/workflows/Windows.yml | 6 ++++-- .github/workflows/javafx.yml | 18 ++++++++++++------ .github/workflows/release.yml | 6 ++++-- 19 files changed, 84 insertions(+), 50 deletions(-) diff --git a/.github/workflows/Compile.yml b/.github/workflows/Compile.yml index 26559127fd..a9d1ad2391 100644 --- a/.github/workflows/Compile.yml +++ b/.github/workflows/Compile.yml @@ -16,16 +16,10 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 - - name: Cache - uses: actions/cache@v2 - with: - path: | - ~/.ivy2/cache - ~/.sbt - ~/.bitcoin-s/binaries - key: ${{ runner.os }}-cache + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Compile and Check Formatting run: sbt -J-Xmx2g +test:compile scalafmtCheckAll diff --git a/.github/workflows/Docs.yml b/.github/workflows/Docs.yml index ed2a3a16d7..12386ffe76 100644 --- a/.github/workflows/Docs.yml +++ b/.github/workflows/Docs.yml @@ -15,9 +15,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/Linux_2.12_App_Chain_Core_Tests.yml b/.github/workflows/Linux_2.12_App_Chain_Core_Tests.yml index 6414803f5b..af2ed7391a 100644 --- a/.github/workflows/Linux_2.12_App_Chain_Core_Tests.yml +++ b/.github/workflows/Linux_2.12_App_Chain_Core_Tests.yml @@ -16,9 +16,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/Linux_2.12_KeyManager_Wallet_DLC_Tests.yml b/.github/workflows/Linux_2.12_KeyManager_Wallet_DLC_Tests.yml index 229bb49133..ccfc8ef5fb 100644 --- a/.github/workflows/Linux_2.12_KeyManager_Wallet_DLC_Tests.yml +++ b/.github/workflows/Linux_2.12_KeyManager_Wallet_DLC_Tests.yml @@ -16,9 +16,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/Linux_2.12_Node_Tests.yml b/.github/workflows/Linux_2.12_Node_Tests.yml index f6a84441c3..1f395f1483 100644 --- a/.github/workflows/Linux_2.12_Node_Tests.yml +++ b/.github/workflows/Linux_2.12_Node_Tests.yml @@ -16,9 +16,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/Linux_2.12_RPC_Tests.yml b/.github/workflows/Linux_2.12_RPC_Tests.yml index 9844dfb7c6..8831804e79 100644 --- a/.github/workflows/Linux_2.12_RPC_Tests.yml +++ b/.github/workflows/Linux_2.12_RPC_Tests.yml @@ -16,9 +16,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: 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 9062e4bee2..0a35610627 100644 --- a/.github/workflows/Linux_2.13_App_Chain_Core_Tests.yml +++ b/.github/workflows/Linux_2.13_App_Chain_Core_Tests.yml @@ -16,9 +16,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: 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 7eeec8f3e7..7248712422 100644 --- a/.github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml +++ b/.github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml @@ -16,9 +16,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/Linux_2.13_Node_Tests.yml b/.github/workflows/Linux_2.13_Node_Tests.yml index 4be7f2ce7c..659a5a1989 100644 --- a/.github/workflows/Linux_2.13_Node_Tests.yml +++ b/.github/workflows/Linux_2.13_Node_Tests.yml @@ -16,9 +16,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/Linux_2.13_RPC_Tests.yml b/.github/workflows/Linux_2.13_RPC_Tests.yml index a2193f4fc0..16a987b5a4 100644 --- a/.github/workflows/Linux_2.13_RPC_Tests.yml +++ b/.github/workflows/Linux_2.13_RPC_Tests.yml @@ -16,9 +16,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/Linux_2.13_ScalaJS_Tests.yml b/.github/workflows/Linux_2.13_ScalaJS_Tests.yml index 0be52050ef..e14af79336 100644 --- a/.github/workflows/Linux_2.13_ScalaJS_Tests.yml +++ b/.github/workflows/Linux_2.13_ScalaJS_Tests.yml @@ -16,9 +16,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/Mac_2.13_RPC_Tests.yml b/.github/workflows/Mac_2.13_RPC_Tests.yml index fef58e3508..1869b29827 100644 --- a/.github/workflows/Mac_2.13_RPC_Tests.yml +++ b/.github/workflows/Mac_2.13_RPC_Tests.yml @@ -16,9 +16,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: 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 a31190084f..17413ced59 100644 --- a/.github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml +++ b/.github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml @@ -16,9 +16,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/PostgresTests.yml b/.github/workflows/PostgresTests.yml index 400a1f8df5..2bf0b2a44a 100644 --- a/.github/workflows/PostgresTests.yml +++ b/.github/workflows/PostgresTests.yml @@ -18,9 +18,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/Secp_Disabled_Tests.yml b/.github/workflows/Secp_Disabled_Tests.yml index 8d9a9ad002..a9b8a1bb9e 100644 --- a/.github/workflows/Secp_Disabled_Tests.yml +++ b/.github/workflows/Secp_Disabled_Tests.yml @@ -18,9 +18,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/TorTests.yml b/.github/workflows/TorTests.yml index ea3bd05d4f..4835e56a25 100644 --- a/.github/workflows/TorTests.yml +++ b/.github/workflows/TorTests.yml @@ -18,9 +18,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml index c0e8f7c196..04c67627f8 100644 --- a/.github/workflows/Windows.yml +++ b/.github/workflows/Windows.yml @@ -19,9 +19,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/javafx.yml b/.github/workflows/javafx.yml index 2efdb55272..85cc6bb4e5 100644 --- a/.github/workflows/javafx.yml +++ b/.github/workflows/javafx.yml @@ -20,9 +20,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Get Previous tag id: previoustag uses: WyriHaximus/github-action-get-previous-tag@v1 @@ -107,9 +109,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Get Previous tag id: previoustag uses: WyriHaximus/github-action-get-previous-tag@v1 @@ -149,9 +153,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Get Previous tag id: previoustag uses: WyriHaximus/github-action-get-previous-tag@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8deff78131..f36266e3a3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,9 +49,11 @@ jobs: with: fetch-depth: 0 - name: Setup Scala - uses: olafurpg/setup-scala@v13 + uses: actions/setup-java@v3 with: - java-version: openjdk@1.17.0 + distribution: 'adopt' + java-version: '17' + cache: 'sbt' - name: Get Previous tag id: previoustag uses: WyriHaximus/github-action-get-previous-tag@v1