Skip to content

[VAN-143698] Updating github action to create and merge pull requests. #193

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
Shmalikov merged 7 commits into from
Sep 8, 2025
Merged

[VAN-143698] Updating github action to create and merge pull requests. #193

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
61af670
Updating github action to create and merge pull requests.
Sep 8, 2025
7f88844
Added step to wait for Pull Request status.
Sep 8, 2025
5952c06
Added logs for status check.
Sep 8, 2025
8002133
Updated checkinf the status.
Sep 8, 2025
3b12487
Added debug logs for state.
Sep 8, 2025
3e61416
Fix for checking out the repo, before merging the PR.
Sep 8, 2025
83d9438
Remove redundant waiting for PR step.
Sep 8, 2025
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
22 changes: 18 additions & 4 deletions .github/workflows/publish-sdk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ on:
required: false
default: false
type: boolean
should_create_and_merge_pr:
description: 'Whether to create and merge pull request'
required: false
default: false
type: boolean

# Permissions to create PR, to write changes, to use PyPi auth
permissions:
Expand Down Expand Up @@ -57,13 +62,13 @@ jobs:

- name: Publish PyPi package
if: github.event_name == 'workflow_dispatch' && github.event.inputs.should_publish_to_pypi == 'true' || github.event_name == 'push'
uses: pypa/gh-action-pypi-publish@v1.12.4
uses: pypa/gh-action-pypi-publish@v1.13.0
with:
packages-dir: "src/${{ matrix.package_folder }}/dist"

create_and_merge_pr:
needs: publish_package
if: needs.publish_package.result == 'success' && (github.event_name == 'workflow_dispatch' && github.event.inputs.from_branch != github.event.inputs.to_branch)
Copy link
Collaborator

@hareskoug hareskoug Sep 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would we not want to keep this guardrail?

Copy link
Collaborator Author

@Shmalikov Shmalikov Sep 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, it sill will fail on creating the Pull Request. This check is redundant.

if: needs.publish_package.result == 'success' && (github.event_name == 'workflow_dispatch' && github.event.inputs.should_create_and_merge_pr == 'true' || github.event_name == 'push')
name: Merge PR
runs-on: ubuntu-latest
env:
Expand All @@ -73,10 +78,19 @@ jobs:
- name: Check out before merge
uses: actions/checkout@v4

- name: Create a token
id: create-token
uses: actions/create-github-app-token@v2
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.APP_PRIVATE_KEY }}
owner: ${{ github.repository_owner }}
repositories: python-sdk

- name: Create Pull Request
id: create_pr
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ steps.create-token.outputs.token }}
run: |
pr_output=$(gh pr create \
--title "Auto-generated SDK from ${{ env.SOURCE_BRANCH }}" \
Expand All @@ -89,6 +103,6 @@ jobs:

- name: Merge Pull Request
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ steps.create-token.outputs.token }}
run: |
gh pr merge ${{ steps.create_pr.outputs.pr_number }} --merge --delete-branch