Skip to content

[SP-18628] Add Back-merge Workflow #174

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[SP-18628] Add Back-merge Workflow #174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 84 additions & 0 deletions .github/workflows/back-merge-handler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: Back Merge handler

on:
push:
branches:
- master
- stable

jobs:
pr_master_to_stable:
runs-on: ubuntu-latest
if: github.ref_name == 'master'
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Check if PR exists
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
prs=$(gh pr list \
--repo "$GITHUB_REPOSITORY" \
--json baseRefName,headRefName \
--jq '
map(select(.baseRefName == "stable" and .headRefName == "master"))
| length
')
if ((prs > 0)); then
echo "Pull Request already exists"
echo "SKIP=true" >> $GITHUB_ENV
fi

- name: Check if stable is ahead
run: |
commits=$(git rev-list origin/stable..origin/master --count)
if ((commits == 0)); then
echo "No diffs was found between branches"
echo "SKIP=true" >> $GITHUB_ENV
fi

- name: Create Pull Request
if: env.SKIP != 'true'
run: gh pr create -B stable -H master --title '[GitHub Actions] Merge master -> stable' --label back-merge --body 'Autogenerated Pull Request for `back-merge` triggered by Github Actions'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

pr_stable_to_develop:
runs-on: ubuntu-latest
if: github.ref_name == 'stable'
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Check if PR exists
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
prs=$(gh pr list \
--repo "$GITHUB_REPOSITORY" \
--json baseRefName,headRefName \
--jq '
map(select(.baseRefName == "develop" and .headRefName == "stable"))
| length
')
if ((prs > 0)); then
echo "Pull Request already exists"
echo "SKIP=true" >> $GITHUB_ENV
fi

- name: Check if stable is ahead
run: |
commits=$(git rev-list origin/develop..origin/stable --count)
if ((commits == 0)); then
echo "No diffs was found between branches"
echo "SKIP=true" >> $GITHUB_ENV
fi

- name: Create Pull Request
if: env.SKIP != 'true'
run: gh pr create -B develop -H stable --title '[GitHub Actions] Merge stable -> develop' --label back-merge --body 'Autogenerated Pull Request for `back-merge` triggered by Github Actions'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Loading