Merge branch 'o1js-main' into feature/avoid-cached-vk-recomputation

MinaProtocol · Oct 25, 2023 · 83e7f97 · 83e7f97
2 parents 796262b + 23ea73a
commit 83e7f97
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/buildkite/scripts/merges-cleanly.sh b/buildkite/scripts/merges-cleanly.sh
@@ -2,7 +2,7 @@
 
 BRANCH=$1
 CURRENT=$(git branch --show-current)
-echo 'Testing for conflicts between the current branch `'"${CURRENT}"'` and `'"${BRANCH}"'`...'
+echo 'Testing for conflicts between the current branch `'"${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"'` and `'"${BRANCH}"'`...'
 
 # Adapted from this stackoverflow answer: https://stackoverflow.com/a/10856937
 # The git merge-tree command shows the content of a 3-way merge without
@@ -32,6 +32,12 @@ if [ $RET -eq 0 ]; then
   echo "No conflicts found against upstream branch ${BRANCH}"
   exit 0
 else
+  # exclude branches for which merging cleanly is not a hard requirement
+  if [ "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" == "o1js-main" ]; then
+    echo "Conflicts were found, but the current branch does not have to merge cleanly. Exiting with code 0."
+    exit 0
+  fi
+
   # Found a conflict
   echo "[ERROR] This pull request conflicts with $BRANCH, please open a new pull request against $BRANCH at this link:"
   echo "https://github.com/MinaProtocol/mina/compare/${BRANCH}...${BUILDKITE_BRANCH}"

diff --git a/buildkite/scripts/run-snark-transaction-profiler.sh b/buildkite/scripts/run-snark-transaction-profiler.sh
@@ -9,15 +9,14 @@ apt-get update
 apt-get install -y git apt-transport-https ca-certificates tzdata curl python3
 
 case "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" in
-  rampup|berkeley|release/2.0.0|develop)
+  rampup|berkeley|release/2.0.0|develop|o1js-main)
     TESTNET_NAME="berkeley"
   ;;
   *)
     TESTNET_NAME="mainnet"
 esac
 
 git config --global --add safe.directory /workdir
-
 source buildkite/scripts/export-git-env-vars.sh
 
 echo "Installing mina daemon package: mina-${TESTNET_NAME}=${MINA_DEB_VERSION}"

diff --git a/buildkite/src/Constants/DebianVersions.dhall b/buildkite/src/Constants/DebianVersions.dhall
@@ -66,7 +66,8 @@ let minimalDirtyWhen = [
   S.strictlyStart (S.contains "dockerfiles/stages"),
   S.exactly "scripts/rebuild-deb" "sh",
   S.exactly "scripts/release-docker" "sh",
-  S.exactly "buildkite/scripts/build-artifact" "sh"
+  S.exactly "buildkite/scripts/build-artifact" "sh",
+  S.exactly "buildkite/scripts/run-snark-transaction-profiler" "sh"
 ]
 
 -- The default debian version (Bullseye) is used in all downstream CI jobs