Skip to content

Added a merge workflow to automator.sh script #3228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 2 commits into from
Mar 24, 2021
Merged

Added a merge workflow to automator.sh script #3228

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1e95b4
added a merge workflow to automator.sh script
Mar 24, 2021
878c95b
Fixed issues picked up by the linter
Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 46 additions & 9 deletions tools/automator/automator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ cleanup() {
}

get_opts() {
if opt="$(getopt -o '' -l branch:,org:,repo:,title:,match-title:,body:,labels:,user:,email:,modifier:,script-path:,cmd:,token-path:,token:,strict,dry-run,verbose -n "$(basename "$0")" -- "$@")"; then
if opt="$(getopt -o '' -l branch:,org:,repo:,title:,match-title:,body:,labels:,user:,email:,modifier:,script-path:,cmd:,token-path:,token:,merge-repository:,merge-branch:,strict,dry-run,verbose -n "$(basename "$0")" -- "$@")"; then
eval set -- "$opt"
else
print_error_and_exit "unable to parse options"
Expand Down Expand Up @@ -97,6 +97,14 @@ get_opts() {
token_path="$tmp_token"
shift 2
;;
--merge-repository)
merge_repository="$2"
shift 2
;;
--merge-branch)
merge_branch="$2"
shift 2
;;
--verbose)
shell_args+=("-x")
shift
Expand Down Expand Up @@ -125,6 +133,7 @@ validate_opts() {
sha="$(current_sha)"
sha_short="$(current_sha --short)"
commit_date="$(commit_date)"
merge=false

if [ -z "${strict:-}" ]; then
strict=false
Expand All @@ -138,6 +147,10 @@ validate_opts() {
branch="$(current_branch)"
fi

if [ -n "${merge_repository:-}" ] && [ -n "${merge_branch:-}" ]; then
merge=true
fi

if [ -z "${title_tmpl:-}" ]; then
title_tmpl='Automator: update $AUTOMATOR_ORG/$AUTOMATOR_REPO@$AUTOMATOR_BRANCH-$AUTOMATOR_MODIFIER'
fi
Expand All @@ -162,8 +175,8 @@ validate_opts() {
print_error_and_exit "token_path or token is a required option"
fi

if [ ! -f "${script_path:-}" ]; then
print_error_and_exit "script-path or cmd is a required option"
if [ ! -f "${script_path:-}" ] && ! $merge; then
print_error_and_exit "either script-path, cmd, or merge-repository and merge-branch are required"
fi

if [ -z "${modifier:-}" ]; then
Expand Down Expand Up @@ -229,6 +242,26 @@ commit() {
add_labels
}

merge() {
local src_branch="${AUTOMATOR_SRC_BRANCH:-none}"
fork_name="$src_branch-$branch-$modifier-$(hash "$title")"
git remote add -f -t "$merge_branch" upstream "$merge_repository"
git -c "user.name=$user" -c "user.email=$email" merge --no-ff -m "$title" --log upstream/"$merge_branch"
local code=$?
if [ "$code" -ne 0 ]; then
print_error "$(git status)" 1
else
if [[ "$(git show --shortstat)" =~ $title ]]; then
git show --shortstat
git push --force "https://$user:$token@github.com/$user/$repo.git" "HEAD:$fork_name"
pull_request="$(create_pr)"
add_labels
else
print_error "No changes to merge" 0
fi
fi
}

work() { (
set -e

Expand All @@ -247,14 +280,18 @@ work() { (

AUTOMATOR_REPO_DIR="$(pwd)"

GOPATH="${gopath}" bash "${shell_args[@]}" "$script_path" "${script_args[@]}"
if $merge; then
merge
else
GOPATH="${gopath}" bash "${shell_args[@]}" "$script_path" "${script_args[@]}"

git add --all
git add --all

if ! git diff --cached --quiet --exit-code; then
commit
elif $strict; then
print_error "no diff for $repo" 1
if ! git diff --cached --quiet --exit-code; then
commit
elif $strict; then
print_error "no diff for $repo" 1
fi
fi

popd
Expand Down