Merge pull request #16817 from MinaProtocol/dw/counterparty-16792

[develop] Counterparty of 16792

Author: dannywillems

buildkite/src/Jobs/Lint/Merge.dhall

@@ -72,6 +72,19 @@ in  Pipeline.build
               , image = (../../Constants/ContainerImages.dhall).toolchainBase
               }
             }
+        , Command.build
+            Command.Config::{
+            , commands =
+              [ Cmd.run "scripts/merged-to-kimchi-stubs-vendors.sh main" ]
+            , label =
+                "[kimchi-stubs-vendors] Check merges cleanly into kimchi-stubs-vendors main branch"
+            , key = "merged-to-kimchi-stubs-vendors-main"
+            , soft_fail = Some (B/SoftFail.Boolean False)
+            , target = Size.Multi
+            , docker = Some Docker::{
+              , image = (../../Constants/ContainerImages.dhall).toolchainBase
+              }
+            }
         , Command.build
             Command.Config::{
             , commands = [ Cmd.run "true" ] : List Cmd.Type

scripts/merged-to-kimchi-stubs-vendors.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+set -eu
+
+if [[ $# -ne 1 ]]; then
+  echo "Usage: $0 <target-branch>"
+  exit 1
+fi
+
+cd src/lib/crypto/kimchi_bindings/stubs/kimchi-stubs-vendors
+
+CURR=$(git rev-parse HEAD)
+
+# temporarily skip SSL verification (for CI)
+if [ "${BUILDKITE:-false}" == true ]
+then
+    git config http.sslVerify false
+    git fetch origin
+    git config http.sslVerify true
+fi
+
+
+BRANCH=$1
+
+function in_branch {
+  if git rev-list origin/"$1" | grep -q "${CURR}"; then
+    echo "kimchi-stubs-vendors submodule commit is an ancestor of $1"
+    true
+  else
+    false
+  fi
+}
+
+if (! in_branch "${BRANCH}"); then
+  echo "kimchi-stubs-vendors submodule commit is NOT an ancestor of ${BRANCH} branch"
+  exit 1
+fi