Revert merge base to original implementation. (#6945)

Summary: Pull Request resolved: #6945 Reviewed By: mbasmanova Differential Revision: D50029485 Pulled By: kgpai fbshipit-source-id: 6c8a29fee47b6aed218a6121cc6e11f5a8ddaf4a
facebookincubator · Oct 6, 2023 · 0ea956a · 0ea956a
1 parent 7de5e26
commit 0ea956a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -83,7 +83,8 @@ jobs:
           git remote add upstream https://github.com/facebookincubator/velox
           git fetch upstream
           git status
-          merge_base="d51190039648bc1b5725e0261889d19ea2e65a85"
+          merge_base=$(git merge-base 'upstream/${{ github.base_ref }}' 'origin/${{ github.head_ref }}') || \
+            { echo "::error::Failed to find merge base"; exit 1; }
           echo "Merge Base: $merge_base"
           git checkout $merge_base
           git submodule update --init --recursive