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

fix: auto merge fixes

Browse Source
This commit is contained in:
sriram veeraghanta 2024-03-06 20:18:47 +05:30
parent 4861be2773
commit 3f1ce9907d
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,13 +8,13 @@ on:
env: env:
CURRENT_BRANCH: ${{ github.ref_name }} CURRENT_BRANCH: ${{ github.ref_name }}
SOURCE_BRANCH: ${{ secrets.SYNC_TARGET_BRANCH_NAME }} # The sync branch such as "sync/ce" SOURCE_BRANCH: ${{ secrets.SYNC_SOURCE_BRANCH_NAME }} # The sync branch such as "sync/ce"
TARGET_BRANCH: ${{ secrets.TARGET_BRANCH }} # The target branch that you would like to merge changes like develop TARGET_BRANCH: ${{ secrets.SYNC_TARGET_BRANCH_NAME }} # The target branch that you would like to merge changes like develop
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} # Personal access token required to modify contents and workflows GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} # Personal access token required to modify contents and workflows
REVIEWER: ${{ secrets.REVIEWER }} REVIEWER: ${{ secrets.SYNC_PR_REVIEWER }}
jobs: jobs:
Check_Branch: Check_Branch:
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs: outputs:
BRANCH_MATCH: ${{ steps.check-branch.outputs.MATCH }} BRANCH_MATCH: ${{ steps.check-branch.outputs.MATCH }}
@ -27,7 +27,7 @@ jobs:
else else
echo "MATCH=false" >> $GITHUB_OUTPUT echo "MATCH=false" >> $GITHUB_OUTPUT
fi fi
Auto_Merge: Auto_Merge:
if: ${{ needs.Check_Branch.outputs.BRANCH_MATCH == 'true' }} if: ${{ needs.Check_Branch.outputs.BRANCH_MATCH == 'true' }}
needs: [Check_Branch] needs: [Check_Branch]
@ -41,6 +41,11 @@ jobs:
with: with:
fetch-depth: 0 # Fetch all history for all branches and tags fetch-depth: 0 # Fetch all history for all branches and tags
- name: Setup Git
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
- name: Setup GH CLI and Git Config - name: Setup GH CLI and Git Config
run: | run: |
type -p curl >/dev/null || (sudo apt update && sudo apt install curl -y) type -p curl >/dev/null || (sudo apt update && sudo apt install curl -y)
@ -50,20 +55,6 @@ jobs:
sudo apt update sudo apt update
sudo apt install gh -y sudo apt install gh -y
- id: git-author
name: Setup Git CLI from Github Token
run: |
VIEWER_JSON=$(gh api graphql -f query='query { viewer { name login databaseId }}' --jq '.data.viewer')
VIEWER_NAME=$(jq --raw-output '.name | values' <<< "${VIEWER_JSON}")
VIEWER_LOGIN=$(jq --raw-output '.login' <<< "${VIEWER_JSON}")
VIEWER_DATABASE_ID=$(jq --raw-output '.databaseId' <<< "${VIEWER_JSON}")
USER_NAME="${VIEWER_NAME:-${VIEWER_LOGIN}}"
USER_EMAIL="${VIEWER_DATABASE_ID}+${VIEWER_LOGIN}@users.noreply.github.com"
git config --global user.name ${USER_NAME}
git config --global user.email ${USER_EMAIL}
- name: Check for merge conflicts - name: Check for merge conflicts
id: conflicts id: conflicts
run: | run: |
@ -88,10 +79,6 @@ jobs:
- name: Create PR to Target Branch - name: Create PR to Target Branch
if: env.HAS_CONFLICTS == 'true' if: env.HAS_CONFLICTS == 'true'
run: | run: |
# Use GitHub CLI to create PR and specify author and committer # Replace 'username' with the actual GitHub username of the reviewer.
PR_URL=$(gh pr create --base $TARGET_BRANCH --head $SOURCE_BRANCH \ PR_URL=$(gh pr create --base $TARGET_BRANCH --head $SOURCE_BRANCH --title "sync: merge conflicts need to be resolved" --body "" --reviewer $REVIEWER)
--title "sync: merge conflicts need to be resolved" \
--body "" \
--reviewer $REVIEWER )
echo "Pull Request created: $PR_URL" echo "Pull Request created: $PR_URL"