Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

chore: added auto merge CI for merging sync branches

Henit Chobisa59c9b3bdcea5
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
new file mode 100644
index 0000000000..60ebe58341
--- /dev/null
+++ b/.github/workflows/auto-merge.yml
@@ -0,0 +1,97 @@
+name: Auto Merge or Create PR on Push
+
+on:
+ workflow_dispatch:
+ push:
+ branches:
+ - "sync/**"
+
+env:
+ CURRENT_BRANCH: ${{ github.ref_name }}
+ SOURCE_BRANCH: ${{ secrets.SYNC_TARGET_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
+ GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} # Personal access token required to modify contents and workflows
+ REVIEWER: ${{ secrets.REVIEWER }}
+
+jobs:
+ Check_Branch:
+ runs-on: ubuntu-latest
+ outputs:
+ BRANCH_MATCH: ${{ steps.check-branch.outputs.MATCH }}
+ steps:
+ - name: Check if current branch matches the secret
+ id: check-branch
+ run: |
+ if [ "$CURRENT_BRANCH" = "$SOURCE_BRANCH" ]; then
+ echo "MATCH=true" >> $GITHUB_OUTPUT
+ else
+ echo "MATCH=false" >> $GITHUB_OUTPUT
+ fi
+
+ Auto_Merge:
+ if: ${{ needs.Check_Branch.outputs.BRANCH_MATCH == 'true' }}
+ needs: [Check_Branch]
+ runs-on: ubuntu-latest
+ permissions:
+ pull-requests: write
+ contents: write
+ steps:
+ - name: Checkout code
+ uses: actions/[email protected]
+ with:
+ fetch-depth: 0 # Fetch all history for all branches and tags
+
+ - name: Setup GH CLI and Git Config
+ run: |
+ type -p curl >/dev/null || (sudo apt update && sudo apt install curl -y)
+ curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+ sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
+ echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+ sudo apt update
+ 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
+ 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 $TARGET_BRANCH
+
+ - name: Create PR to Target Branch
+ if: env.HAS_CONFLICTS == 'true'
+ run: |
+ # Use GitHub CLI to create PR and specify author and committer
+ PR_URL=$(gh pr create --base $TARGET_BRANCH --head $SOURCE_BRANCH \
+ --title "sync: merge conflicts need to be resolved" \
+ --body "" \
+ --reviewer $REVIEWER )
+ echo "Pull Request created: $PR_URL"
+