Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/scripts/create-platform-release-pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ create_release_pr() {

# Push and create PR using helper functions
push_branch_with_handling "${release_branch_name}"
create_pr_if_not_exists "${release_branch_name}" "release: ${new_version}" "${release_body}" "main" "" "head"
create_pr_if_not_exists "${release_branch_name}" "release: ${new_version}" "${release_body}" "${BASE_BRANCH}" "" "head"
}

# Create changelog branch and generate changelog
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/create-release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@ name: Create Release Pull Request
on:
workflow_call:
inputs:
base-branch:
checkout-base-branch:
required: true
type: string
description: 'The base branch, tag, or SHA for git operations and the pull request.'
release-pr-base-branch:
required: true
type: string
description: 'The base branch, tag, or SHA for the release pull request.'
semver-version:
required: true
type: string
Expand Down Expand Up @@ -78,7 +82,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ inputs.base-branch }}
ref: ${{ inputs.checkout-base-branch }}
token: ${{ secrets.github-token }}

# Step 2: Checkout github-tools repository
Expand All @@ -101,7 +105,8 @@ jobs:
echo "Input Values:"
echo "-------------"
echo "Platform: ${{ inputs.platform }}"
echo "Base Branch: ${{ inputs.base-branch }}"
echo "Checkout Base Branch: ${{ inputs.checkout-base-branch }}"
echo "Release PR Base Branch: ${{ inputs.release-pr-base-branch }}"
echo "Semver Version: ${{ inputs.semver-version }}"
echo "Previous Version Tag: ${{ inputs.previous-version-tag }}"
echo "Test Only Mode: ${{ inputs.test-only }}"
Expand All @@ -122,7 +127,7 @@ jobs:
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.github-token }}
BASE_BRANCH: ${{ inputs.base-branch }}
BASE_BRANCH: ${{ inputs.release-pr-base-branch }}
GITHUB_REPOSITORY_URL: '${{ github.server_url }}/${{ github.repository }}'
TEST_ONLY: ${{ inputs.test-only }}
GOOGLE_DOCUMENT_ID: ${{ inputs.release-sheet-google-document-id }}
Expand Down
Loading