fixup! 🚀 Rebase to mergebase fork-point instead of 'master' or 'develop'

Author: shnizzedy

.circleci/config.yml

@@ -143,8 +143,15 @@ jobs:
               if ! [[ $CIRCLE_BRANCH = 'master' ]]
                 then
                   git fetch --all
-                  REBASE_BASE=$(git merge-base --fork-point HEAD)
-                  GIT_SEQUENCE_EDITOR=dev/circleci_data/drop_version_bump_commits git rebase -X ours -i $REBASE_BASE --empty drop
+                  if [[ -n ${CIRCLE_PR_NUMBER} && -n ${GITHUB_PR_BASE_TOKEN} ]]
+                    then
+                      curl -L "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64" -o jq
+                      chmod +x jq
+                      REBASE_BASE=origin/$(curl -u shnizzedy:$GITHUB_PR_BASE_TOKEN "https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls/$CIRCLE_PR_NUMBER" | jq '.base.ref' | tr -d '"')
+                  else
+                    REBASE_BASE=$(git rev-parse --short HEAD~30)
+                  fi
+                GIT_SEQUENCE_EDITOR=dev/circleci_data/drop_version_bump_commits git rebase -X ours -i $REBASE_BASE --empty drop
               fi
               echo "v${VERSION}" > version
               sed -i -r "s/^(# [Vv]ersion ).*$/# Version ${VERSION}/g" dev/docker_data/default_pipeline.yml