Skip to content

chore: INFRA-3000: Merge Version Bump PRs with comment #179

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

Merged
XxdpavelxX merged 1 commit into from
Dec 2, 2025
Merged

chore: INFRA-3000: Merge Version Bump PRs with comment #179

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
32 changes: 26 additions & 6 deletions .github/workflows/merge-approved-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ on:
required: true
type: number
description: 'The number of the pull request to process'
required-base-branch:
required: true
type: string
description: 'The required base branch name (e.g., main)'
head-branch-pattern:
required: true
type: string
description: 'Regex pattern for the required head branch (e.g., ^stable-main-[0-9]+\.[0-9]+\.[0-9]+$)'
secrets:
github-token:
required: true
Expand All @@ -16,6 +24,19 @@ jobs:
merge-pr:
runs-on: ubuntu-latest
steps:
# Validate required inputs
- name: Validate Inputs
run: |
if [[ -z "${{ inputs.required-base-branch }}" ]]; then
echo "::error::Missing required input: 'required-base-branch' must be provided."
exit 1
fi
if [[ -z "${{ inputs.head-branch-pattern }}" ]]; then
echo "::error::Missing required input: 'head-branch-pattern' must be provided."
exit 1
fi
echo "Inputs validated: required-base-branch='${{ inputs.required-base-branch }}', head-branch-pattern='${{ inputs.head-branch-pattern }}'"

# Fetch PR metadata (head and base branches) using the GitHub API
- name: Get PR Details
id: get-pr
Expand All @@ -34,22 +55,21 @@ jobs:
core.setOutput('base', pr.base.ref);
core.setOutput('head', pr.head.ref);

# Verify that the PR targets 'main' from 'stable-main-x.y.z'
# Verify that the PR targets the required base branch from the required head pattern
- name: Verify Branch Names
id: verify-branches
run: |
# Define the required branch pattern
REQUIRED_BASE="main"
# Head branch must match pattern: stable-main-X.Y.Z where X, Y, Z are integers
HEAD_PATTERN="^stable-main-[0-9]+\.[0-9]+\.[0-9]+$"
# Get required branch patterns from inputs
REQUIRED_BASE="${{ inputs.required-base-branch }}"
HEAD_PATTERN="${{ inputs.head-branch-pattern }}"

# Get actual values from the previous step
ACTUAL_BASE="${{ steps.get-pr.outputs.base }}"
ACTUAL_HEAD="${{ steps.get-pr.outputs.head }}"

# Compare actual branches against requirements
if [[ "$ACTUAL_BASE" != "$REQUIRED_BASE" ]] || ! [[ "$ACTUAL_HEAD" =~ $HEAD_PATTERN ]]; then
echo "Skipping: PR must be from 'stable-main-X.Y.Z' to '$REQUIRED_BASE'. Found $ACTUAL_HEAD -> $ACTUAL_BASE"
echo "Skipping: PR must be from '$HEAD_PATTERN' to '$REQUIRED_BASE'. Found $ACTUAL_HEAD -> $ACTUAL_BASE"
echo "should_skip=true" >> "$GITHUB_OUTPUT"
else
echo "Branches match requirements: Source '$ACTUAL_HEAD' -> Target '$ACTUAL_BASE'."
Expand Down
Loading