Skip to content

fix(action): allow merging cpython on existing branch #110

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.

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
merged 1 commit into from
Sep 13, 2021

Conversation

mattwang44
Copy link
Collaborator

[WHY]

The procedure in current workflow for cpython-syncing is listed as follow:

  1. Cronjob for syncing with cpython triggered daily. A draft PR is sent if any source string has changed.
  2. Developers of this repo should check if the PR is good enough to be merged. Add commits to the same branch if needed (e.g. fixing fuzzy entry and updating translation based on modified source string). Convert it to regular PR if it's ready for review.
  3. Reviewer review and merge this PR.

However, if any commit is added in the step 2. and the cpython-syncing job is triggered before step 3., the commit(s) will be eliminated when forced-pushing since the current workflow do not editing based on existing branch.

[HOW]

Add a stage for reseting to existing branch. If the branch does not exist, this stage would fail but does not block the job.

@mattwang44 mattwang44 requested a review from josix September 13, 2021 09:04
@mattwang44 mattwang44 merged commit 2d3ada9 into python:3.9 Sep 13, 2021
@mattwang44 mattwang44 deleted the fix/sync-workflow/edit-on-branch branch September 13, 2021 09:25
beccalzh pushed a commit to beccalzh/python-docs-zh-tw that referenced this pull request Sep 4, 2024
…on-branch

fix(action): allow merging cpython on existing branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants