-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
Add github/branch/edit
action
#195
Draft
mikealfare
wants to merge
1
commit into
main
Choose a base branch
from
github-branch-edit
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
name: "Merge GitHub branch" | ||
description: "Merge a source branch into a target branch on GitHub and return the resulting SHA" | ||
|
||
inputs: | ||
source-branch: | ||
description: "The source branch to be merged" | ||
required: true | ||
target-branch: | ||
description: "The target branch to receive the merge" | ||
required: true | ||
message: | ||
description: "Commit message for the merge" | ||
required: true | ||
delete-source-branch: | ||
description: "Will delete the source branch after merging" | ||
default: "true" | ||
|
||
outputs: | ||
sha: | ||
description: "The commit SHA for the merge" | ||
value: ${{ steps.merge.outputs.sha }} | ||
|
||
runs: | ||
using: composite | ||
steps: | ||
- name: "[DEBUG] Inputs" | ||
shell: bash | ||
run: | | ||
echo "==========INPUTS==========" | ||
echo source-branch : ${{ inputs.source-branch }} | ||
echo target-branch : ${{ inputs.target-branch }} | ||
echo message : ${{ inputs.message }} | ||
echo delete-source-branch : ${{ inputs.delete-source-branch }} | ||
|
||
- name: "Merge `${{ inputs.source-branch }}` into `${{ inputs.target-branch }}`" | ||
uses: everlytic/[email protected] | ||
with: | ||
source_ref: ${{ inputs.source-branch }} | ||
target_branch: ${{ inputs.target-branch }} | ||
commit_message_template: "[automated] ${{ inputs.message }}" | ||
github_token: ${{ secrets.FISHTOWN_BOT_PAT }} | ||
|
||
- name: "Checkout `${{ inputs.source-branch }}`" | ||
if: ${{ fromJSON(inputs.delete-source-branch) }} | ||
uses: actions/checkout@v3 | ||
with: | ||
ref: ${{ inputs.target-branch }} | ||
|
||
- name: "Delete `${{ inputs.source-branch }}`" | ||
if: ${{ fromJSON(inputs.delete-source-branch) }} | ||
shell: bash | ||
run: git push origin -d ${{ inputs.source-branch }} | ||
|
||
- name: "Checkout `${{ inputs.target-branch }}`" | ||
uses: actions/checkout@v3 | ||
with: | ||
ref: ${{ inputs.target-branch }} | ||
|
||
- name: "Get commit SHA for the merge" | ||
id: merge | ||
shell: bash | ||
run: | | ||
git pull | ||
echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT | ||
|
||
- name: "[INFO] Merge Github branch" | ||
shell: bash | ||
run: echo "::notice title=$TITLE::$MESSAGE" | ||
env: | ||
TITLE: "[${{ env.NOTIFICATION_PREFIX }}]: Merge GitHub branch" | ||
MESSAGE: "`${{ inputs.source-branch }}` was merged into `${{ inputs.target-branch }}` with SHA `${{ steps.merge.outputs.sha }}`" | ||
|
||
- name: "[DEBUG] Outputs" | ||
shell: bash | ||
run: | | ||
echo "==========OUTPUTS==========" | ||
echo sha : ${{ steps.merge.outputs.sha }} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we're checking everything out ourseleves anyways, why even use this action and not do it ourseleves? You're just extending this action with a little cleanup. Adding the merge part ourselves isn't hard and I can see value in this being centralized somewhere.