From 4674ca4c5a899fb2ed6db8ace3fdbac0264b30a2 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Thu, 3 Dec 2020 16:39:33 -0600 Subject: [PATCH 01/23] Setup Github Actions --- .github/workflows/main.yml | 168 ++++++++++++++++++++++++++++++++++++ .travis.yml | 172 ++++++++++++++++++------------------- 2 files changed, 254 insertions(+), 86 deletions(-) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000000..e89ff29459f0 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,168 @@ +name: CI +env: + SCALA_2_13: 2.13.4 + SCALA_2_12: 2.12.12 + COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + +on: + pull_request: + +jobs: + compile: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Compile and Check Formatting + run: sbt ++${SCALA_2_12} test:compile scalafmtCheckAll + + Compile-Website: + needs: compile + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Compile website + run: sbt ++${SCALA_2_13} docs/mdoc + + Linux_2-13_Bitcoind_and_Eclair_RPC_Tests: + needs: compile + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Linux 2.13 bitcoind and eclair rpc tests + run: sbt ++${SCALA_2_13} downloadBitcoind downloadEclair coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls + + Linux_2-12_Bitcoind_and_Eclair_RPC_Tests: + needs: compile + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Linux 2.12 bitcoind and eclair rpc tests + run: sbt ++${SCALA_2_12} downloadBitcoind downloadEclair coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls + + Linux_2-13_App_Chain_Node_and_Core_Tests: + needs: compile + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Linux 2.13 App, Chain, Node, and Core Tests + run: sbt ++${SCALA_2_13} downloadBitcoind chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test + + Linux_2-12_App_Chain_Node_and_Core_Tests: + needs: compile + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Linux 2.12 App, Chain, Node, and Core Tests + run: sbt ++${SCALA_2_12} downloadBitcoind chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test + + Linux_2-13_KeyManager_Wallet_and_DLC_Tests: + needs: compile + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Linux 2.13 KeyManager, Wallet, and DLC tests + run: sbt ++${SCALA_2_13} downloadBitcoind keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls + + Linux_2-12_KeyManager_Wallet_and_DLC_Tests: + needs: compile + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Linux 2.12 KeyManager, Wallet, and DLC tests + run: sbt ++${SCALA_2_12} downloadBitcoind keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls + + Secp256k1_Disabled_Tests: + needs: compile + runs-on: ubuntu-latest + env: + DISABLE_SECP256K1: "true" + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Secp256k1 Disabled Core Test + run: sbt ++${SCALA_2_13} cryptoTest/test coreTest/test + + PostgreSQL_Tests: + needs: compile + runs-on: ubuntu-latest + env: + PG_ENABLED: "1" + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: PostgreSQL tests + run: sbt ++${SCALA_2_13} downloadBitcoind dbCommonsTest/test walletTest/test chainTest/test nodeTest/test + + Mac_2-13_Bitcoind_and_Eclair_RPC_Tests: + needs: compile + runs-on: macos-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Linux 2.13 bitcoind and eclair rpc tests + run: sbt ++${SCALA_2_13} downloadBitcoind downloadEclair coverage cryptoTest/test coreTest/test appCommonsTest/test bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls + + Mac_2-13_Wallet_Node_and_DLC_Tests: + needs: compile + runs-on: macos-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Linux 2.13 Wallet, Node, and DLC tests + run: sbt ++${SCALA_2_13} downloadBitcoind walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coveralls diff --git a/.travis.yml b/.travis.yml index e58a42d85df4..6603dda68814 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,92 +18,92 @@ jobs: - TEST_COMMAND="test:compile scalafmtCheck test:scalafmtCheck" scala: 2.12.12 - - stage: compile - os: linux - name: "Compile & Formatting Check" - env: - - TEST_COMMAND="test:compile scalafmtCheck test:scalafmtCheck" - scala: 2.12.12 - - # compile website, to check for documentation regressions - - stage: test - name: Compile website - env: - - TEST_COMMAND="docs/mdoc" - scala: 2.13.4 - - - stage: test - name: Linux 2.13.4 bitcoind and eclair rpc tests - os: linux - env: - - TEST_COMMAND="bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls" - scala: 2.13.4 - - - stage: test - name: Linux 2.12.12 bitcoind and eclair rpc tests - os: linux - env: - - TEST_COMMAND="bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls" - scala: 2.12.12 - - - stage: test - name: Linux 2.13.4 App, Chain, Node, and Core Tests - os: linux - env: - - TEST_COMMAND="chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test" - scala: 2.13.4 - - - stage: test - name: Linux 2.12.12 App, Chain, Node, and Core Tests - os: linux - env: - - TEST_COMMAND="chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test" - scala: 2.12.12 - - stage: test - name: Linux 2.13.4 KeyManager Wallet, dlc tests - os: linux - env: - - TEST_COMMAND="keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls" - scala: 2.13.4 - - - stage: test - name: Linux 2.12.12 KeyManager, Wallet, dlc tests - os: linux - env: - - TEST_COMMAND="keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls" - scala: 2.12.12 - - - stage: test - os: linux - name: "Secp256k1 Disabled Core Test" - env: - - DISABLE_SECP256K1="true" - - TEST_COMMAND="coreTest/test cryptoTest/test" - scala: 2.13.4 - - - stage: test - os: linux - name: "PostgreSQL tests" - env: - - PG_ENABLED="1" - - TEST_COMMAND="dbCommonsTest/test chainTest/test nodeTest/test walletTest/test" - scala: 2.13.4 - - - stage: test - os: osx - name: "macOS bitcoind and eclair tests" - env: - - TEST_COMMAND="cryptoTest/test coreTest/test appCommonsTest/test bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls" - scala: 2.13.4 - - # skip all test tagged as UsesExperimentalBitcoind - # TODO remove this condition once we have a neutrino enabled bitcoind binary for OSX - - stage: test - os: osx - name: "macOS wallet, node, dlc tests" - env: - - TEST_COMMAND="walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coveralls" - scala: 2.13.4 +# - stage: compile +# os: linux +# name: "Compile & Formatting Check" +# env: +# - TEST_COMMAND="test:compile scalafmtCheck test:scalafmtCheck" +# scala: 2.12.12 + +# # compile website, to check for documentation regressions +# - stage: test +# name: Compile website +# env: +# - TEST_COMMAND="docs/mdoc" +# scala: 2.13.4 +# +# - stage: test +# name: Linux 2.13.4 bitcoind and eclair rpc tests +# os: linux +# env: +# - TEST_COMMAND="bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls" +# scala: 2.13.4 +# +# - stage: test +# name: Linux 2.12.12 bitcoind and eclair rpc tests +# os: linux +# env: +# - TEST_COMMAND="bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls" +# scala: 2.12.12 +# +# - stage: test +# name: Linux 2.13.4 App, Chain, Node, and Core Tests +# os: linux +# env: +# - TEST_COMMAND="chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test" +# scala: 2.13.4 +# +# - stage: test +# name: Linux 2.12.12 App, Chain, Node, and Core Tests +# os: linux +# env: +# - TEST_COMMAND="chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test" +# scala: 2.12.12 +# - stage: test +# name: Linux 2.13.4 KeyManager Wallet, dlc tests +# os: linux +# env: +# - TEST_COMMAND="keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls" +# scala: 2.13.4 +# +# - stage: test +# name: Linux 2.12.12 KeyManager, Wallet, dlc tests +# os: linux +# env: +# - TEST_COMMAND="keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls" +# scala: 2.12.12 +# +# - stage: test +# os: linux +# name: "Secp256k1 Disabled Core Test" +# env: +# - DISABLE_SECP256K1="true" +# - TEST_COMMAND="coreTest/test cryptoTest/test" +# scala: 2.13.4 +# +# - stage: test +# os: linux +# name: "PostgreSQL tests" +# env: +# - PG_ENABLED="1" +# - TEST_COMMAND="dbCommonsTest/test chainTest/test nodeTest/test walletTest/test" +# scala: 2.13.4 + +# - stage: test +# os: osx +# name: "macOS bitcoind and eclair tests" +# env: +# - TEST_COMMAND="cryptoTest/test coreTest/test appCommonsTest/test bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls" +# scala: 2.13.4 +# +# # skip all test tagged as UsesExperimentalBitcoind +# # TODO remove this condition once we have a neutrino enabled bitcoind binary for OSX +# - stage: test +# os: osx +# name: "macOS wallet, node, dlc tests" +# env: +# - TEST_COMMAND="walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coveralls" +# scala: 2.13.4 # Release snapshots/versions of all libraries # run ci-release only if previous stages passed - stage: release From 7739689f37bfbff6b71c2474b15edb122fb06c2c Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Thu, 3 Dec 2020 17:16:18 -0600 Subject: [PATCH 02/23] Add covergae, fix names --- .github/workflows/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e89ff29459f0..84f317233b65 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,7 +70,7 @@ jobs: with: java-version: 1.8 - name: Linux 2.13 App, Chain, Node, and Core Tests - run: sbt ++${SCALA_2_13} downloadBitcoind chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test + run: sbt ++${SCALA_2_13} downloadBitcoind coverage chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test Linux_2-12_App_Chain_Node_and_Core_Tests: needs: compile @@ -83,7 +83,7 @@ jobs: with: java-version: 1.8 - name: Linux 2.12 App, Chain, Node, and Core Tests - run: sbt ++${SCALA_2_12} downloadBitcoind chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test + run: sbt ++${SCALA_2_12} downloadBitcoind coverage chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test Linux_2-13_KeyManager_Wallet_and_DLC_Tests: needs: compile @@ -96,7 +96,7 @@ jobs: with: java-version: 1.8 - name: Linux 2.13 KeyManager, Wallet, and DLC tests - run: sbt ++${SCALA_2_13} downloadBitcoind keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls + run: sbt ++${SCALA_2_13} downloadBitcoind coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls Linux_2-12_KeyManager_Wallet_and_DLC_Tests: needs: compile @@ -109,7 +109,7 @@ jobs: with: java-version: 1.8 - name: Linux 2.12 KeyManager, Wallet, and DLC tests - run: sbt ++${SCALA_2_12} downloadBitcoind keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls + run: sbt ++${SCALA_2_12} downloadBitcoind coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls Secp256k1_Disabled_Tests: needs: compile @@ -151,7 +151,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - name: Linux 2.13 bitcoind and eclair rpc tests + - name: Mac 2.13 bitcoind and eclair rpc tests run: sbt ++${SCALA_2_13} downloadBitcoind downloadEclair coverage cryptoTest/test coreTest/test appCommonsTest/test bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls Mac_2-13_Wallet_Node_and_DLC_Tests: @@ -164,5 +164,5 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - name: Linux 2.13 Wallet, Node, and DLC tests - run: sbt ++${SCALA_2_13} downloadBitcoind walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coveralls + - name: Mac 2.13 Wallet, Node, and DLC tests + run: sbt ++${SCALA_2_13} downloadBitcoind coverage walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coveralls From 13c1a2036ff1d8ac747c4cfbd5f3b81b6a880b52 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Thu, 3 Dec 2020 17:33:16 -0600 Subject: [PATCH 03/23] Use scala setup --- .github/workflows/main.yml | 72 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 84f317233b65..6b3431c031be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,10 +13,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 with: - java-version: 1.8 + java-version: "adopt@1.8" - name: Compile and Check Formatting run: sbt ++${SCALA_2_12} test:compile scalafmtCheckAll @@ -26,10 +26,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 with: - java-version: 1.8 + java-version: "adopt@1.8" - name: Compile website run: sbt ++${SCALA_2_13} docs/mdoc @@ -39,10 +39,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 with: - java-version: 1.8 + java-version: "adopt@1.8" - name: Linux 2.13 bitcoind and eclair rpc tests run: sbt ++${SCALA_2_13} downloadBitcoind downloadEclair coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls @@ -52,10 +52,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 with: - java-version: 1.8 + java-version: "adopt@1.8" - name: Linux 2.12 bitcoind and eclair rpc tests run: sbt ++${SCALA_2_12} downloadBitcoind downloadEclair coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls @@ -65,10 +65,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 with: - java-version: 1.8 + java-version: "adopt@1.8" - name: Linux 2.13 App, Chain, Node, and Core Tests run: sbt ++${SCALA_2_13} downloadBitcoind coverage chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test @@ -78,10 +78,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 with: - java-version: 1.8 + java-version: "adopt@1.8" - name: Linux 2.12 App, Chain, Node, and Core Tests run: sbt ++${SCALA_2_12} downloadBitcoind coverage chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test @@ -91,10 +91,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 with: - java-version: 1.8 + java-version: "adopt@1.8" - name: Linux 2.13 KeyManager, Wallet, and DLC tests run: sbt ++${SCALA_2_13} downloadBitcoind coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls @@ -104,10 +104,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 with: - java-version: 1.8 + java-version: "adopt@1.8" - name: Linux 2.12 KeyManager, Wallet, and DLC tests run: sbt ++${SCALA_2_12} downloadBitcoind coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls @@ -119,10 +119,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 with: - java-version: 1.8 + java-version: "adopt@1.8" - name: Secp256k1 Disabled Core Test run: sbt ++${SCALA_2_13} cryptoTest/test coreTest/test @@ -134,10 +134,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 with: - java-version: 1.8 + java-version: "adopt@1.8" - name: PostgreSQL tests run: sbt ++${SCALA_2_13} downloadBitcoind dbCommonsTest/test walletTest/test chainTest/test nodeTest/test @@ -147,10 +147,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 with: - java-version: 1.8 + java-version: "adopt@1.8" - name: Mac 2.13 bitcoind and eclair rpc tests run: sbt ++${SCALA_2_13} downloadBitcoind downloadEclair coverage cryptoTest/test coreTest/test appCommonsTest/test bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls @@ -160,9 +160,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 with: - java-version: 1.8 + java-version: "adopt@1.8" - name: Mac 2.13 Wallet, Node, and DLC tests run: sbt ++${SCALA_2_13} downloadBitcoind coverage walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coveralls From 28b72db8ddbb2c9b5c94aedb0f371dad5e4dc627 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Thu, 3 Dec 2020 17:38:18 -0600 Subject: [PATCH 04/23] Add windows matrix --- .github/workflows/main.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b3431c031be..d409dc5affb7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -166,3 +166,16 @@ jobs: java-version: "adopt@1.8" - name: Mac 2.13 Wallet, Node, and DLC tests run: sbt ++${SCALA_2_13} downloadBitcoind coverage walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coveralls + + WindowsTest: + needs: compile + runs-on: windows-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 + with: + java-version: "adopt@1.8" + - name: Windows Crypto, Core, and Database tests + run: sbt ++${SCALA_2_13} cryptoTest/test coreTest/test dbCommonsTest/test From 68f8003b86be645727e10718580a7dd6b11862ae Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Thu, 3 Dec 2020 17:57:54 -0600 Subject: [PATCH 05/23] Add caching for deps and binaries --- .github/workflows/main.yml | 104 +++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d409dc5affb7..1d581cfa7bc9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,6 +17,14 @@ jobs: uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache - name: Compile and Check Formatting run: sbt ++${SCALA_2_12} test:compile scalafmtCheckAll @@ -30,6 +38,14 @@ jobs: uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache - name: Compile website run: sbt ++${SCALA_2_13} docs/mdoc @@ -43,6 +59,14 @@ jobs: uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache - name: Linux 2.13 bitcoind and eclair rpc tests run: sbt ++${SCALA_2_13} downloadBitcoind downloadEclair coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls @@ -56,6 +80,14 @@ jobs: uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache - name: Linux 2.12 bitcoind and eclair rpc tests run: sbt ++${SCALA_2_12} downloadBitcoind downloadEclair coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls @@ -69,6 +101,14 @@ jobs: uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache - name: Linux 2.13 App, Chain, Node, and Core Tests run: sbt ++${SCALA_2_13} downloadBitcoind coverage chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test @@ -82,6 +122,14 @@ jobs: uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache - name: Linux 2.12 App, Chain, Node, and Core Tests run: sbt ++${SCALA_2_12} downloadBitcoind coverage chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test @@ -95,6 +143,14 @@ jobs: uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache - name: Linux 2.13 KeyManager, Wallet, and DLC tests run: sbt ++${SCALA_2_13} downloadBitcoind coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls @@ -108,6 +164,14 @@ jobs: uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache - name: Linux 2.12 KeyManager, Wallet, and DLC tests run: sbt ++${SCALA_2_12} downloadBitcoind coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls @@ -123,6 +187,14 @@ jobs: uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache - name: Secp256k1 Disabled Core Test run: sbt ++${SCALA_2_13} cryptoTest/test coreTest/test @@ -138,6 +210,14 @@ jobs: uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache - name: PostgreSQL tests run: sbt ++${SCALA_2_13} downloadBitcoind dbCommonsTest/test walletTest/test chainTest/test nodeTest/test @@ -151,6 +231,14 @@ jobs: uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache - name: Mac 2.13 bitcoind and eclair rpc tests run: sbt ++${SCALA_2_13} downloadBitcoind downloadEclair coverage cryptoTest/test coreTest/test appCommonsTest/test bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls @@ -164,6 +252,14 @@ jobs: uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache - name: Mac 2.13 Wallet, Node, and DLC tests run: sbt ++${SCALA_2_13} downloadBitcoind coverage walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coveralls @@ -177,5 +273,13 @@ jobs: uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache - name: Windows Crypto, Core, and Database tests run: sbt ++${SCALA_2_13} cryptoTest/test coreTest/test dbCommonsTest/test From 34a4b018cb20042287e6e7c99a057ea00764992b Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Thu, 3 Dec 2020 18:12:55 -0600 Subject: [PATCH 06/23] Fix windows matrix --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1d581cfa7bc9..7946469f9b66 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -267,6 +267,9 @@ jobs: needs: compile runs-on: windows-latest steps: + - name: Configure git + run: "git config --global core.autocrlf false" + shell: bash - name: Checkout uses: actions/checkout@v2 - name: Setup Scala @@ -283,3 +286,4 @@ jobs: key: ${{ runner.os }}-cache - name: Windows Crypto, Core, and Database tests run: sbt ++${SCALA_2_13} cryptoTest/test coreTest/test dbCommonsTest/test + shell: bash From 90db05054d75cdde53f0c6d58085a5b21ab05726 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Thu, 3 Dec 2020 18:14:40 -0600 Subject: [PATCH 07/23] Remove unneeded java version declaration --- .github/workflows/main.yml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7946469f9b66..a8c3ee841a4e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,8 +15,6 @@ jobs: uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - name: Cache uses: actions/cache@v2 with: @@ -36,8 +34,6 @@ jobs: uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - name: Cache uses: actions/cache@v2 with: @@ -57,8 +53,6 @@ jobs: uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - name: Cache uses: actions/cache@v2 with: @@ -78,8 +72,6 @@ jobs: uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - name: Cache uses: actions/cache@v2 with: @@ -99,8 +91,6 @@ jobs: uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - name: Cache uses: actions/cache@v2 with: @@ -120,8 +110,6 @@ jobs: uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - name: Cache uses: actions/cache@v2 with: @@ -141,8 +129,6 @@ jobs: uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - name: Cache uses: actions/cache@v2 with: @@ -162,8 +148,6 @@ jobs: uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - name: Cache uses: actions/cache@v2 with: @@ -185,8 +169,6 @@ jobs: uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - name: Cache uses: actions/cache@v2 with: @@ -208,8 +190,6 @@ jobs: uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - name: Cache uses: actions/cache@v2 with: @@ -229,8 +209,6 @@ jobs: uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - name: Cache uses: actions/cache@v2 with: @@ -250,8 +228,6 @@ jobs: uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - name: Cache uses: actions/cache@v2 with: @@ -274,8 +250,6 @@ jobs: uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - name: Cache uses: actions/cache@v2 with: From 76a868882bd9b2c67996be61eef8cfc6a4d984c5 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Thu, 3 Dec 2020 18:35:58 -0600 Subject: [PATCH 08/23] Disable windows, add feeProviderTest --- .github/workflows/main.yml | 49 +++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a8c3ee841a4e..fdf42659a61b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -138,7 +138,7 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: Linux 2.13 KeyManager, Wallet, and DLC tests - run: sbt ++${SCALA_2_13} downloadBitcoind coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls + run: sbt ++${SCALA_2_13} downloadBitcoind coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls feeProviderTest/test walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls Linux_2-12_KeyManager_Wallet_and_DLC_Tests: needs: compile @@ -157,7 +157,7 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: Linux 2.12 KeyManager, Wallet, and DLC tests - run: sbt ++${SCALA_2_12} downloadBitcoind coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls + run: sbt ++${SCALA_2_12} downloadBitcoind coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls feeProviderTest/test walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls Secp256k1_Disabled_Tests: needs: compile @@ -239,25 +239,26 @@ jobs: - name: Mac 2.13 Wallet, Node, and DLC tests run: sbt ++${SCALA_2_13} downloadBitcoind coverage walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coveralls - WindowsTest: - needs: compile - runs-on: windows-latest - steps: - - name: Configure git - run: "git config --global core.autocrlf false" - shell: bash - - name: Checkout - uses: actions/checkout@v2 - - name: Setup Scala - uses: olafurpg/setup-scala@v10 - - name: Cache - uses: actions/cache@v2 - with: - path: | - ~/.ivy2/cache - ~/.sbt - ~/.bitcoin-s/binaries - key: ${{ runner.os }}-cache - - name: Windows Crypto, Core, and Database tests - run: sbt ++${SCALA_2_13} cryptoTest/test coreTest/test dbCommonsTest/test - shell: bash +# FIXME Need new secp256k1 bindings on windows +# WindowsTest: +# needs: compile +# runs-on: windows-latest +# steps: +# - name: Configure git +# run: "git config --global core.autocrlf false" +# shell: bash +# - name: Checkout +# uses: actions/checkout@v2 +# - name: Setup Scala +# uses: olafurpg/setup-scala@v10 +# - name: Cache +# uses: actions/cache@v2 +# with: +# path: | +# ~/.ivy2/cache +# ~/.sbt +# ~/.bitcoin-s/binaries +# key: ${{ runner.os }}-cache +# - name: Windows Crypto, Core, and Database tests +# run: sbt ++${SCALA_2_13} cryptoTest/test coreTest/test dbCommonsTest/test +# shell: bash From 04e687c7d3e38f4e45c9340e3c938300cebe124c Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Thu, 3 Dec 2020 18:51:17 -0600 Subject: [PATCH 09/23] Fix test --- .../scala/org/bitcoins/node/networking/P2PClientTest.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/node-test/src/test/scala/org/bitcoins/node/networking/P2PClientTest.scala b/node-test/src/test/scala/org/bitcoins/node/networking/P2PClientTest.scala index 98da0ac45ed9..234e6dbc8a8b 100644 --- a/node-test/src/test/scala/org/bitcoins/node/networking/P2PClientTest.scala +++ b/node-test/src/test/scala/org/bitcoins/node/networking/P2PClientTest.scala @@ -85,10 +85,8 @@ class P2PClientTest extends BitcoindRpcTest with CachedBitcoinSAppConfig { } it must "return the entire byte array if a message is not aligned to a byte frame" in { - implicit val nodeConf = config.nodeConf - val versionMessage = - VersionMessage(TestNet3.dnsSeeds(0), np) - val networkMsg = NetworkMessage(np, versionMessage) + val networkMsg = NetworkMessage( + "fabfb5da76657273696f6e00000000006e000000b12d23e97d1101000000000000000000b487c95f00000000000000000000000000000000000000000000ffffc0f1a38e480c010000000000000000000000000000000000ffff7f000101480c0000000000000000182f626974636f696e732d7370762d6e6f64652f302e302e310000000000") //remove last byte so the message is not aligned val bytes = networkMsg.bytes.slice(0, networkMsg.bytes.size - 1) val (_, unAlignedBytes) = P2PClient.parseIndividualMessages(bytes) From 01b3dec41ff18c027aeb4adf81dd499ff90a71f4 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 13:50:53 -0600 Subject: [PATCH 10/23] docs: only website --- .github/workflows/main.yml | 33 +++++++++++ .github/workflows/release.yml | 20 +++++++ .travis.yml | 100 ---------------------------------- 3 files changed, 53 insertions(+), 100 deletions(-) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fdf42659a61b..b7418432f8bb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,6 +10,7 @@ on: jobs: compile: runs-on: ubuntu-latest + if: ${{ !startsWith(github.event.head_commit.message, 'docs') }} steps: - name: Checkout uses: actions/checkout@v2 @@ -26,8 +27,28 @@ jobs: - name: Compile and Check Formatting run: sbt ++${SCALA_2_12} test:compile scalafmtCheckAll + Docs: + runs-on: ubuntu-latest + if: ${{ startsWith(github.event.head_commit.message, 'docs') }} + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache + - name: Compile website + run: sbt ++${SCALA_2_13} docs/mdoc + Compile-Website: needs: compile + if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -47,6 +68,7 @@ jobs: Linux_2-13_Bitcoind_and_Eclair_RPC_Tests: needs: compile + if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -66,6 +88,7 @@ jobs: Linux_2-12_Bitcoind_and_Eclair_RPC_Tests: needs: compile + if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -85,6 +108,7 @@ jobs: Linux_2-13_App_Chain_Node_and_Core_Tests: needs: compile + if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -104,6 +128,7 @@ jobs: Linux_2-12_App_Chain_Node_and_Core_Tests: needs: compile + if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -123,6 +148,7 @@ jobs: Linux_2-13_KeyManager_Wallet_and_DLC_Tests: needs: compile + if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -142,6 +168,7 @@ jobs: Linux_2-12_KeyManager_Wallet_and_DLC_Tests: needs: compile + if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -161,6 +188,7 @@ jobs: Secp256k1_Disabled_Tests: needs: compile + if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest env: DISABLE_SECP256K1: "true" @@ -182,6 +210,7 @@ jobs: PostgreSQL_Tests: needs: compile + if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest env: PG_ENABLED: "1" @@ -203,6 +232,7 @@ jobs: Mac_2-13_Bitcoind_and_Eclair_RPC_Tests: needs: compile + if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: macos-latest steps: - name: Checkout @@ -222,6 +252,7 @@ jobs: Mac_2-13_Wallet_Node_and_DLC_Tests: needs: compile + if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: macos-latest steps: - name: Checkout @@ -239,9 +270,11 @@ jobs: - name: Mac 2.13 Wallet, Node, and DLC tests run: sbt ++${SCALA_2_13} downloadBitcoind coverage walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coveralls + # FIXME Need new secp256k1 bindings on windows # WindowsTest: # needs: compile +# if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} # runs-on: windows-latest # steps: # - name: Configure git diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000000..5dc5afcfd608 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,20 @@ +name: Release +on: + push: + branches: [master, main] + tags: ["*"] +jobs: + publish: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2.3.4 + with: + fetch-depth: 0 + - uses: olafurpg/setup-scala@v10 + - uses: olafurpg/setup-gpg@v3 + - run: sbt ci-release docs/publishWebsite + env: + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + PGP_SECRET: ${{ secrets.PGP_SECRET }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} diff --git a/.travis.yml b/.travis.yml index 6603dda68814..dc3acefac2fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,106 +4,6 @@ dist: xenial jobs: include: - # compile website, to check for documentation regressions for docs only PRs - - stage: docs - name: Compile Website - env: - - TEST_COMMAND="docs/mdoc" - scala: 2.13.4 - - - stage: trivial - os: linux - name: "Compile & Formatting Check" - env: - - TEST_COMMAND="test:compile scalafmtCheck test:scalafmtCheck" - scala: 2.12.12 - -# - stage: compile -# os: linux -# name: "Compile & Formatting Check" -# env: -# - TEST_COMMAND="test:compile scalafmtCheck test:scalafmtCheck" -# scala: 2.12.12 - -# # compile website, to check for documentation regressions -# - stage: test -# name: Compile website -# env: -# - TEST_COMMAND="docs/mdoc" -# scala: 2.13.4 -# -# - stage: test -# name: Linux 2.13.4 bitcoind and eclair rpc tests -# os: linux -# env: -# - TEST_COMMAND="bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls" -# scala: 2.13.4 -# -# - stage: test -# name: Linux 2.12.12 bitcoind and eclair rpc tests -# os: linux -# env: -# - TEST_COMMAND="bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls" -# scala: 2.12.12 -# -# - stage: test -# name: Linux 2.13.4 App, Chain, Node, and Core Tests -# os: linux -# env: -# - TEST_COMMAND="chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test" -# scala: 2.13.4 -# -# - stage: test -# name: Linux 2.12.12 App, Chain, Node, and Core Tests -# os: linux -# env: -# - TEST_COMMAND="chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls cryptoTest/test crypto/coverageReport crypto/coverageAggregate crypto/coveralls coreTest/test core/coverageReport core/coverageAggregate core/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test" -# scala: 2.12.12 -# - stage: test -# name: Linux 2.13.4 KeyManager Wallet, dlc tests -# os: linux -# env: -# - TEST_COMMAND="keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls" -# scala: 2.13.4 -# -# - stage: test -# name: Linux 2.12.12 KeyManager, Wallet, dlc tests -# os: linux -# env: -# - TEST_COMMAND="keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls" -# scala: 2.12.12 -# -# - stage: test -# os: linux -# name: "Secp256k1 Disabled Core Test" -# env: -# - DISABLE_SECP256K1="true" -# - TEST_COMMAND="coreTest/test cryptoTest/test" -# scala: 2.13.4 -# -# - stage: test -# os: linux -# name: "PostgreSQL tests" -# env: -# - PG_ENABLED="1" -# - TEST_COMMAND="dbCommonsTest/test chainTest/test nodeTest/test walletTest/test" -# scala: 2.13.4 - -# - stage: test -# os: osx -# name: "macOS bitcoind and eclair tests" -# env: -# - TEST_COMMAND="cryptoTest/test coreTest/test appCommonsTest/test bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls" -# scala: 2.13.4 -# -# # skip all test tagged as UsesExperimentalBitcoind -# # TODO remove this condition once we have a neutrino enabled bitcoind binary for OSX -# - stage: test -# os: osx -# name: "macOS wallet, node, dlc tests" -# env: -# - TEST_COMMAND="walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test dlcOracle/coverageReport dlcOracle/coveralls" -# scala: 2.13.4 # Release snapshots/versions of all libraries # run ci-release only if previous stages passed - stage: release From 95a33c8f1b01b521d12ce6b20687e90b0f4a73d0 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 13:58:21 -0600 Subject: [PATCH 11/23] docs: flip? --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b7418432f8bb..4fa2546c7768 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ on: jobs: compile: runs-on: ubuntu-latest - if: ${{ !startsWith(github.event.head_commit.message, 'docs') }} + if: ${{ startsWith(github.event.head_commit.message, 'docs') }} steps: - name: Checkout uses: actions/checkout@v2 @@ -29,7 +29,7 @@ jobs: Docs: runs-on: ubuntu-latest - if: ${{ startsWith(github.event.head_commit.message, 'docs') }} + if: ${{ ! startsWith(github.event.head_commit.message, 'docs') }} steps: - name: Checkout uses: actions/checkout@v2 From 39c817b7c337025ac4f23a5c25c36ec841365a69 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 14:03:52 -0600 Subject: [PATCH 12/23] trivial: test --- .github/workflows/main.yml | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4fa2546c7768..e790c0aec96e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ on: jobs: compile: runs-on: ubuntu-latest - if: ${{ startsWith(github.event.head_commit.message, 'docs') }} + if: ${{ startsWith(github.event.head_commit.message, 'docs:') || startsWith(github.event.head_commit.message, 'trivial:') }} steps: - name: Checkout uses: actions/checkout@v2 @@ -29,7 +29,26 @@ jobs: Docs: runs-on: ubuntu-latest - if: ${{ ! startsWith(github.event.head_commit.message, 'docs') }} + if: ${{ ! startsWith(github.event.head_commit.message, 'docs:') && startsWith(github.event.head_commit.message, 'trivial:') }} + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Scala + uses: olafurpg/setup-scala@v10 + - name: Cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + ~/.bitcoin-s/binaries + key: ${{ runner.os }}-cache + - name: Compile website + run: sbt ++${SCALA_2_13} docs/mdoc + + trivial: + runs-on: ubuntu-latest + if: ${{ ! startsWith(github.event.head_commit.message, 'trivial:') }} steps: - name: Checkout uses: actions/checkout@v2 @@ -48,7 +67,6 @@ jobs: Compile-Website: needs: compile - if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -68,7 +86,6 @@ jobs: Linux_2-13_Bitcoind_and_Eclair_RPC_Tests: needs: compile - if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -88,7 +105,6 @@ jobs: Linux_2-12_Bitcoind_and_Eclair_RPC_Tests: needs: compile - if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -108,7 +124,6 @@ jobs: Linux_2-13_App_Chain_Node_and_Core_Tests: needs: compile - if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -128,7 +143,6 @@ jobs: Linux_2-12_App_Chain_Node_and_Core_Tests: needs: compile - if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -148,7 +162,6 @@ jobs: Linux_2-13_KeyManager_Wallet_and_DLC_Tests: needs: compile - if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -168,7 +181,6 @@ jobs: Linux_2-12_KeyManager_Wallet_and_DLC_Tests: needs: compile - if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest steps: - name: Checkout @@ -188,7 +200,6 @@ jobs: Secp256k1_Disabled_Tests: needs: compile - if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest env: DISABLE_SECP256K1: "true" @@ -210,7 +221,6 @@ jobs: PostgreSQL_Tests: needs: compile - if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: ubuntu-latest env: PG_ENABLED: "1" @@ -232,7 +242,6 @@ jobs: Mac_2-13_Bitcoind_and_Eclair_RPC_Tests: needs: compile - if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: macos-latest steps: - name: Checkout @@ -252,7 +261,6 @@ jobs: Mac_2-13_Wallet_Node_and_DLC_Tests: needs: compile - if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} runs-on: macos-latest steps: - name: Checkout @@ -274,7 +282,6 @@ jobs: # FIXME Need new secp256k1 bindings on windows # WindowsTest: # needs: compile -# if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }} # runs-on: windows-latest # steps: # - name: Configure git From c768973ce89c6d5687a7b3865e551f293e091650 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 14:04:42 -0600 Subject: [PATCH 13/23] normal --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e790c0aec96e..a859bde433a2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,7 +48,7 @@ jobs: trivial: runs-on: ubuntu-latest - if: ${{ ! startsWith(github.event.head_commit.message, 'trivial:') }} + if: ${{ ! startsWith(github.event.head_commit.message, 'trivial:') && startsWith(github.event.head_commit.message, 'docs:') }} steps: - name: Checkout uses: actions/checkout@v2 From 9206066c3cc7e3e873a1cafd40a78f33fcd8d8bf Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 14:08:51 -0600 Subject: [PATCH 14/23] docs: test --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a859bde433a2..2aaa2123f18a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,6 +43,8 @@ jobs: ~/.sbt ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache + - name: echo + run: echo ${{ github.event.head_commit.message }} {{ startsWith(github.event.head_commit.message, 'docs:') }} - name: Compile website run: sbt ++${SCALA_2_13} docs/mdoc From e503cc02c2baba7e8b1d586e42d71e82c14adca8 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 14:32:30 -0600 Subject: [PATCH 15/23] docs: xx --- .github/workflows/main.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2aaa2123f18a..0d8d4279794c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ on: jobs: compile: runs-on: ubuntu-latest - if: ${{ startsWith(github.event.head_commit.message, 'docs:') || startsWith(github.event.head_commit.message, 'trivial:') }} + if: "! contains(github.event.head_commit.message, 'docs:') && ! contains(github.event.head_commit.message, 'trivial:') " steps: - name: Checkout uses: actions/checkout@v2 @@ -27,9 +27,9 @@ jobs: - name: Compile and Check Formatting run: sbt ++${SCALA_2_12} test:compile scalafmtCheckAll - Docs: + docs: runs-on: ubuntu-latest - if: ${{ ! startsWith(github.event.head_commit.message, 'docs:') && startsWith(github.event.head_commit.message, 'trivial:') }} + if: "contains(github.event.head_commit.message, 'docs:')" steps: - name: Checkout uses: actions/checkout@v2 @@ -43,14 +43,12 @@ jobs: ~/.sbt ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - - name: echo - run: echo ${{ github.event.head_commit.message }} {{ startsWith(github.event.head_commit.message, 'docs:') }} - name: Compile website run: sbt ++${SCALA_2_13} docs/mdoc trivial: runs-on: ubuntu-latest - if: ${{ ! startsWith(github.event.head_commit.message, 'trivial:') && startsWith(github.event.head_commit.message, 'docs:') }} + if: "contains(github.event.head_commit.message, 'trivial:')" steps: - name: Checkout uses: actions/checkout@v2 From 7c24f908ca804548e41bc1da85a5bfb0b1c6c0ca Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 14:36:25 -0600 Subject: [PATCH 16/23] test From 93d247fc56bf61bcd75787bb13c4ed01b20fbf7b Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 14:37:03 -0600 Subject: [PATCH 17/23] trivial: f From 36439e2c2f30252bccebc24cbf0720f00efd5c60 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 14:37:47 -0600 Subject: [PATCH 18/23] trivial: f --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0d8d4279794c..5a93e278735e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ on: jobs: compile: runs-on: ubuntu-latest - if: "! contains(github.event.head_commit.message, 'docs:') && ! contains(github.event.head_commit.message, 'trivial:') " + if: "! contains(github.event.head_commit.message, 'docs') && ! contains(github.event.head_commit.message, 'trivial') " steps: - name: Checkout uses: actions/checkout@v2 @@ -29,7 +29,7 @@ jobs: docs: runs-on: ubuntu-latest - if: "contains(github.event.head_commit.message, 'docs:')" + if: "contains(github.event.head_commit.message, 'docs')" steps: - name: Checkout uses: actions/checkout@v2 @@ -48,7 +48,7 @@ jobs: trivial: runs-on: ubuntu-latest - if: "contains(github.event.head_commit.message, 'trivial:')" + if: "contains(github.event.head_commit.message, 'trivial')" steps: - name: Checkout uses: actions/checkout@v2 From 310748a656f89fc72571a92e4d3fad285b510c30 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 14:39:20 -0600 Subject: [PATCH 19/23] docs From 4434972515ebbb962b540f8ddb69933e037c5707 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 14:44:51 -0600 Subject: [PATCH 20/23] trivial: f --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5a93e278735e..481dce3def43 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ on: jobs: compile: runs-on: ubuntu-latest - if: "! contains(github.event.head_commit.message, 'docs') && ! contains(github.event.head_commit.message, 'trivial') " + if: "! startsWith(github.event.head_commit.message, 'docs') && ! startsWith(github.event.head_commit.message, 'trivial') " steps: - name: Checkout uses: actions/checkout@v2 @@ -29,7 +29,7 @@ jobs: docs: runs-on: ubuntu-latest - if: "contains(github.event.head_commit.message, 'docs')" + if: "startsWith(github.event.head_commit.message, 'docs')" steps: - name: Checkout uses: actions/checkout@v2 @@ -48,7 +48,7 @@ jobs: trivial: runs-on: ubuntu-latest - if: "contains(github.event.head_commit.message, 'trivial')" + if: "startsWith(github.event.head_commit.message, 'trivial')" steps: - name: Checkout uses: actions/checkout@v2 From f7770b4135bd6f329d96fd0d2cd793f87c0bd4eb Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 14:54:42 -0600 Subject: [PATCH 21/23] norm --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 481dce3def43..0eb16505ab33 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: docs: runs-on: ubuntu-latest - if: "startsWith(github.event.head_commit.message, 'docs')" + if: "startsWith(github.event.head_commit.message, 'github')" steps: - name: Checkout uses: actions/checkout@v2 From 4757abf347eb459119fa20f15819fad2021c8524 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 15:03:24 -0600 Subject: [PATCH 22/23] norm --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0eb16505ab33..994ecea9e8e8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ on: jobs: compile: runs-on: ubuntu-latest - if: "! startsWith(github.event.head_commit.message, 'docs') && ! startsWith(github.event.head_commit.message, 'trivial') " + if: "!startsWith(github.event.head_commit.message, 'docs:') && !startsWith(github.event.head_commit.message, 'trivial:')" steps: - name: Checkout uses: actions/checkout@v2 @@ -29,7 +29,7 @@ jobs: docs: runs-on: ubuntu-latest - if: "startsWith(github.event.head_commit.message, 'github')" + if: "startsWith(github.event.head_commit.message, 'docs:')" steps: - name: Checkout uses: actions/checkout@v2 @@ -43,12 +43,12 @@ jobs: ~/.sbt ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - - name: Compile website + - name: Compile Website run: sbt ++${SCALA_2_13} docs/mdoc trivial: runs-on: ubuntu-latest - if: "startsWith(github.event.head_commit.message, 'trivial')" + if: "startsWith(github.event.head_commit.message, 'trivial:')" steps: - name: Checkout uses: actions/checkout@v2 From bd5eb5b353f07b8becacd6ba71251f7f21836745 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Sun, 6 Dec 2020 15:04:34 -0600 Subject: [PATCH 23/23] docs: ff