From 13cd5f101366420fc31e414f38079914aaad70b8 Mon Sep 17 00:00:00 2001 From: harkamal Date: Wed, 24 Nov 2021 19:35:16 +0530 Subject: [PATCH] activate geth and EL interop sim commits as workflow env vars --- .github/workflows/test-sim-merge.yml | 33 ++++++++++++++++------------ 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test-sim-merge.yml b/.github/workflows/test-sim-merge.yml index 6ea28493e7e7..2233a57d682a 100644 --- a/.github/workflows/test-sim-merge.yml +++ b/.github/workflows/test-sim-merge.yml @@ -2,6 +2,10 @@ name: Sim merge tests on: [pull_request, push] +env: + GETH_COMMIT: 932939feb6735f4295911063c09b1100aee24cb1 + NETHERMIND_COMMIT: 8e54f87ce2e36e20a73b73a0e470816b1edc9b92 + jobs: sim-merge-tests: name: Sim merge tests @@ -31,27 +35,28 @@ jobs: if: steps.cache-deps.outputs.cache-hit == 'true' # - # Install Geth merge interop - # - uses: actions/setup-go@v2 - # - name: Clone Geth merge interop branch - # run: git clone -b kintsugi-spec https://github.com/MariusVanDerWijden/go-ethereum.git && cd go-ethereum && git reset --hard b629e2560aae26059bf69ef19690385e078cbefd && git submodule update - # - name: Build Geth - # run: cd go-ethereum && make + #Install Geth merge interop + - uses: actions/setup-go@v2 + - name: Clone Geth merge interop branch + run: git clone -b kintsugi-spec https://github.com/MariusVanDerWijden/go-ethereum.git && cd go-ethereum && git reset --hard $GETH_COMMIT && git submodule update --init --recursive + - name: Build Geth + run: cd go-ethereum && make - # - name: Test Lodestar <> Geth interop - # run: yarn test:sim:merge-interop - # working-directory: packages/lodestar - # env: - # EL_BINARY_DIR: ../../go-ethereum/build/bin - # EL_SCRIPT_DIR: geth - # EL_PORT: 8545 + - name: Test Lodestar <> Geth interop + run: yarn test:sim:merge-interop + working-directory: packages/lodestar + env: + EL_BINARY_DIR: ../../go-ethereum/build/bin + EL_SCRIPT_DIR: geth + EL_PORT: 8545 + TEST_TXS: simple # Install Nethermind merge interop - uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.x' - name: Clone Nethermind merge interop branch - run: git clone -b themerge_kintsugi https://github.com/NethermindEth/nethermind --recursive && cd nethermind && git reset --hard 8e54f87ce2e36e20a73b73a0e470816b1edc9b92 && git submodule update + run: git clone -b themerge_kintsugi https://github.com/NethermindEth/nethermind --recursive && cd nethermind && git reset --hard $NETHERMIND_COMMIT && git submodule update --init --recursive - name: Build Nethermind run: cd nethermind/src/Nethermind && dotnet build Nethermind.sln -c Release