Skip to content

Fix: don't swap review labels on "Update branch"#1227

Merged
pawel-kow merged 11 commits into
masterfrom
feature/add-labels-from-PR-review
Jun 14, 2026
Merged

Fix: don't swap review labels on "Update branch"#1227
pawel-kow merged 11 commits into
masterfrom
feature/add-labels-from-PR-review

Conversation

@pawel-kow

Copy link
Copy Markdown
Member

Fix: don't swap review labels on "Update branch"

Problem

Clicking "Update branch" on a PR creates a merge commit from master into the PR branch. This triggered the synchronize event, causing the workflow to incorrectly swap review issuesnew review needed even though the PR author had not pushed any new work.

Example: commit 27072ddd on PR #1218.

Fix

In the trigger workflow, before treating a synchronize event as new author work, check whether the head commit is a two-parent merge commit whose second parent matches the current master tip. If it is, skip the artifact upload entirely — no label changes are made.

All other pushes (regular commits, force-pushes, author-initiated merges) continue to trigger the label swap as before.

@pawel-kow pawel-kow merged commit ab966f2 into master Jun 14, 2026
3 of 5 checks passed
@pawel-kow pawel-kow deleted the feature/add-labels-from-PR-review branch June 14, 2026 10:55
@github-actions github-actions Bot added Checklist of common problems not complete See PR template and mark *all* checkboxes, even if not applicable. Explain any discrepancies. PR description incomplete The PR description template was not filled in at all, altered or filled in improperly. Test links missing No test links from Online Editor provided labels Jun 14, 2026
@github-actions

Copy link
Copy Markdown

JSON Filename Check Failed

  • File in subdirectory not allowed: .github/workflows/review-trigger.yml

@github-actions

Copy link
Copy Markdown

PR Description Check Failed

The PR description is missing required elements. Please update it according to the PR template.

Details

Labels to add: Checklist of common problems not complete, PR description incomplete, Test links missing
Labels to remove: Forged editor links

PR description check FAILED:
  FAIL  'Type of change' section not found
  FAIL  'How Has This Been Tested?' section not found
  FAIL  'Checklist of common problems' section not found
  FAIL  'Online Editor test results' section not found

@github-actions github-actions Bot added the filename-error Files not in main folder or not named correctly label Jun 14, 2026
@github-actions

Copy link
Copy Markdown

JSON Schema Validation Passed

@github-actions github-actions Bot added the automerge-possible Label indicating, that restrictive linter checks all pass. For now it's PoC. label Jun 14, 2026
@github-actions

Copy link
Copy Markdown

Linter OK

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge-possible Label indicating, that restrictive linter checks all pass. For now it's PoC. Checklist of common problems not complete See PR template and mark *all* checkboxes, even if not applicable. Explain any discrepancies. filename-error Files not in main folder or not named correctly PR description incomplete The PR description template was not filled in at all, altered or filled in improperly. Test links missing No test links from Online Editor provided

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant