thunderstrike/plane
thunderstrike/plane
2
0
Fork 0
forked from github/plane
Code Pull Requests Activity

fix: auto merge workflow fixes

Browse Source
This commit is contained in:
sriram veeraghanta 2024-04-29 18:50:44 +05:30
parent 1c4ca42603
commit 32d14d7000
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/auto-merge.yml vendored
View File

@ -1,4 +1,4 @@
name: Auto Merge or Create PR on Push name: Create PR on Sync
on: on:
workflow_dispatch: workflow_dispatch:
@ -56,29 +56,7 @@ jobs:
sudo apt update sudo apt update
sudo apt install gh -y sudo apt install gh -y
- name: Check for merge conflicts
id: conflicts
run: |
git fetch origin $TARGET_BRANCH
git checkout $TARGET_BRANCH
# Attempt to merge the main branch into the current branch
if $(git merge --no-commit --no-ff $SOURCE_BRANCH); then
echo "No merge conflicts detected."
echo "HAS_CONFLICTS=false" >> $GITHUB_ENV
else
echo "Merge conflicts detected."
echo "HAS_CONFLICTS=true" >> $GITHUB_ENV
git merge --abort
fi
- name: Merge Change to Target Branch
if: env.HAS_CONFLICTS == 'false'
run: |
git commit -m "Merge branch '$SOURCE_BRANCH' into $TARGET_BRANCH"
git push origin HEAD:$TARGET_BRANCH
- name: Create PR to Target Branch - name: Create PR to Target Branch
if: env.HAS_CONFLICTS == 'true'
run: | run: |
# get all pull requests and check if there is already a PR # get all pull requests and check if there is already a PR
PR_EXISTS=$(gh pr list --base $TARGET_BRANCH --head $SOURCE_BRANCH --json number | jq '.[] | .number') PR_EXISTS=$(gh pr list --base $TARGET_BRANCH --head $SOURCE_BRANCH --json number | jq '.[] | .number')