From 497eebfe5c81c3c4a34fe80186e75ed87d2f95c1 Mon Sep 17 00:00:00 2001 From: harkamal Date: Tue, 7 Dec 2021 12:29:23 +0530 Subject: [PATCH 1/2] moving el merge commits to more stable config --- .github/workflows/test-sim-merge.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-sim-merge.yml b/.github/workflows/test-sim-merge.yml index 41496b06ed03..12673bfe1264 100644 --- a/.github/workflows/test-sim-merge.yml +++ b/.github/workflows/test-sim-merge.yml @@ -2,10 +2,6 @@ name: Sim merge tests on: [pull_request, push] -env: - GETH_COMMIT: 932939feb6735f4295911063c09b1100aee24cb1 - NETHERMIND_COMMIT: 8e54f87ce2e36e20a73b73a0e470816b1edc9b92 - jobs: sim-merge-tests: name: Sim merge tests @@ -38,7 +34,7 @@ jobs: #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 + run: git clone -b merge-interop https://github.com/g11tech/go-ethereum.git && cd go-ethereum && git submodule update --init --recursive - name: Build Geth run: cd go-ethereum && make @@ -56,7 +52,7 @@ jobs: 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 $NETHERMIND_COMMIT && git submodule update --init --recursive + run: git clone -b merge-interop https://github.com/g11tech/nethermind --recursive && cd nethermind && git submodule update --init --recursive - name: Build Nethermind run: cd nethermind/src/Nethermind && dotnet build Nethermind.sln -c Release From 910af552e7d3962d9ec5a2571a51b6fa1ae88938 Mon Sep 17 00:00:00 2001 From: harkamal Date: Tue, 7 Dec 2021 12:56:41 +0530 Subject: [PATCH 2/2] pinning the commit ids --- .github/workflows/test-sim-merge.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-sim-merge.yml b/.github/workflows/test-sim-merge.yml index 12673bfe1264..6e90c2d46b03 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: c65940378e9f96ca7dce2d5c9c3b7260439b01a8 + NETHERMIND_COMMIT: 8e54f87ce2e36e20a73b73a0e470816b1edc9b92 + jobs: sim-merge-tests: name: Sim merge tests @@ -34,7 +38,7 @@ jobs: #Install Geth merge interop - uses: actions/setup-go@v2 - name: Clone Geth merge interop branch - run: git clone -b merge-interop https://github.com/g11tech/go-ethereum.git && cd go-ethereum && git submodule update --init --recursive + run: git clone -b merge-interop https://github.com/g11tech/go-ethereum.git && cd go-ethereum && git reset --hard $GETH_COMMIT && git submodule update --init --recursive - name: Build Geth run: cd go-ethereum && make @@ -52,7 +56,7 @@ jobs: with: dotnet-version: '5.0.x' - name: Clone Nethermind merge interop branch - run: git clone -b merge-interop https://github.com/g11tech/nethermind --recursive && cd nethermind && git submodule update --init --recursive + run: git clone -b merge-interop https://github.com/g11tech/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