From d220e35113d3f67eb787b7a985739404339ca38a Mon Sep 17 00:00:00 2001 From: Daniel Lawton Date: Thu, 23 Jul 2026 14:34:14 +0100 Subject: [PATCH] Add rebasebot post-rebase hook script This script is invoked by rebasebot via --post-rebase-hook to run `make merge-bot` after a rebase, replacing the merge-bot --run-make flag. Signed-off-by: Daniel Lawton --- hack/rebasebot-helpers/post-rebase.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100755 hack/rebasebot-helpers/post-rebase.sh diff --git a/hack/rebasebot-helpers/post-rebase.sh b/hack/rebasebot-helpers/post-rebase.sh new file mode 100755 index 0000000000..ac8ace2eaf --- /dev/null +++ b/hack/rebasebot-helpers/post-rebase.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# This script is run by rebasebot as a post-rebase hook during the rebase of +# openshift/cluster-api-provider-openstack. +# It replaces the merge-bot's --run-make flag which ran `make merge-bot`. + +set -e +set -o pipefail + +if [[ -n "$(git status --porcelain)" ]]; then + echo "post-rebase hook requires a clean worktree" >&2 + exit 1 +fi + +make merge-bot + +if [[ -z "$REBASEBOT_GIT_USERNAME" || -z "$REBASEBOT_GIT_EMAIL" ]]; then + author_flag=() +else + author_flag=(--author="$REBASEBOT_GIT_USERNAME <$REBASEBOT_GIT_EMAIL>") +fi + +if [[ -n $(git status --porcelain) ]]; then + git add -A + git commit "${author_flag[@]}" -q -m "UPSTREAM: : Run make merge-bot" +fi