moving el merge commits to more stable config (#3485)

* moving el merge commits to more stable config * pinning the commit ids
ChainSafe · Dec 7, 2021 · fe09d92 · fe09d92
1 parent 1bf5457
commit fe09d92
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/test-sim-merge.yml b/.github/workflows/test-sim-merge.yml
@@ -3,7 +3,7 @@ name: Sim merge tests
 on: [pull_request, push]
 
 env:
-  GETH_COMMIT: 932939feb6735f4295911063c09b1100aee24cb1
+  GETH_COMMIT: c65940378e9f96ca7dce2d5c9c3b7260439b01a8
   NETHERMIND_COMMIT: 8e54f87ce2e36e20a73b73a0e470816b1edc9b92
 
 jobs:
@@ -38,7 +38,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 reset --hard $GETH_COMMIT && git submodule update --init --recursive
       - name: Build Geth
         run: cd go-ethereum && make
 
@@ -56,7 +56,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 reset --hard $NETHERMIND_COMMIT && git submodule update --init --recursive
       - name: Build Nethermind
         run: cd nethermind/src/Nethermind && dotnet build Nethermind.sln -c Release