From 10883446bcaf6dab9ce6bb784bad93b74d4f7b53 Mon Sep 17 00:00:00 2001 From: JRWilding Date: Mon, 23 Jan 2023 14:57:45 +0000 Subject: [PATCH 1/3] Update step.yml --- step.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/step.yml b/step.yml index 79e9a07..87b59a9 100644 --- a/step.yml +++ b/step.yml @@ -81,6 +81,14 @@ inputs: a git branch name is_expand: true is_required: true + - additional_merge_options: + opts: + title: "Additional merge options" + summary: Extra --options to add to git merge + description: | + command line options allowed by git merge + is_expand: true + is_required: false outputs: - CREATED_PULL_REQUEST: From ecece318e5d12858251667350e5625ebd1131f85 Mon Sep 17 00:00:00 2001 From: JRWilding Date: Mon, 23 Jan 2023 14:58:18 +0000 Subject: [PATCH 2/3] Update step.sh --- step.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/step.sh b/step.sh index 82ad388..aeeebd8 100644 --- a/step.sh +++ b/step.sh @@ -52,7 +52,7 @@ git checkout $branch_to_merge_from #! Checkout the branch to merge into git checkout $branch_to_merge_into -git merge $branch_to_merge_from || create_pr +git merge $branch_to_merge_from $additional_merge_options || create_pr echo 'no conflicts' @@ -62,4 +62,4 @@ git push #! Return success exit 0 -fi \ No newline at end of file +fi From 69dd319bc7431e03aac3f16719375d216fde3ae8 Mon Sep 17 00:00:00 2001 From: JRWilding Date: Thu, 16 Feb 2023 13:46:29 +0000 Subject: [PATCH 3/3] ssssshhh, don't log ALL branches and tags --- step.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/step.sh b/step.sh index aeeebd8..3fee089 100644 --- a/step.sh +++ b/step.sh @@ -1,8 +1,6 @@ #!/bin/bash set -ex -echo "This is the value specified for the input 'example_step_input': ${example_step_input}" - # # --- Export Environment Variables for other Steps: # You can export Environment Variables for other Steps with @@ -44,7 +42,7 @@ create_pr() { exit 1 } -git fetch +git fetch -q #! Checkout the branch to merge from git checkout $branch_to_merge_from