Skip to content

ci: avoid branch clash in regenerate-models workflow#812

Open
vdusek wants to merge 1 commit into
masterfrom
fix/regenerate-models-branch-clash
Open

ci: avoid branch clash in regenerate-models workflow#812
vdusek wants to merge 1 commit into
masterfrom
fix/regenerate-models-branch-clash

Conversation

@vdusek
Copy link
Copy Markdown
Contributor

@vdusek vdusek commented May 21, 2026

Summary

Fixes the branch-clash bug in .github/workflows/manual_regenerate_models.yaml that was flagged as a follow-up in #809. The recent manual run (failing CI) failed at the Commit model changes step with:

fatal: refusing to fetch into branch 'refs/heads/update-models-manual' checked out at '...'

Cause

The local git switch -c "$BRANCH" step pre-created the branch unconditionally. apify/actions/signed-commit@v1.0.0 with create-branch: 'true' then ran git fetch --depth=1 origin "$BRANCH:refs/heads/$BRANCH", which refuses to fetch into a checked-out branch.

Fix

  • When the remote branch already exists: fetch + check it out locally, and tell signed-commit create-branch: false.
  • When it doesn't exist: stay on the default branch and let signed-commit create the remote branch with create-branch: true.

The create_branch decision is exported from the renamed Set up branch step and consumed by the signed-commit step.

@vdusek vdusek added adhoc Ad-hoc unplanned task added during the sprint. t-tooling Issues with this label are in the ownership of the tooling team. labels May 21, 2026
@vdusek vdusek self-assigned this May 21, 2026
@github-actions github-actions Bot added this to the 141st sprint - Tooling team milestone May 21, 2026
@vdusek vdusek changed the title fix: avoid branch clash in regenerate-models workflow ci: avoid branch clash in regenerate-models workflow May 21, 2026
@codecov
Copy link
Copy Markdown

codecov Bot commented May 21, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 94.52%. Comparing base (252e0e4) to head (8e92095).

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #812      +/-   ##
==========================================
+ Coverage   94.50%   94.52%   +0.02%     
==========================================
  Files          48       48              
  Lines        4916     4916              
==========================================
+ Hits         4646     4647       +1     
+ Misses        270      269       -1     
Flag Coverage Δ
integration 90.54% <ø> (-0.17%) ⬇️
unit 83.03% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@vdusek
Copy link
Copy Markdown
Contributor Author

vdusek commented May 21, 2026

It works now: #813

@vdusek vdusek requested a review from janbuchar May 21, 2026 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

adhoc Ad-hoc unplanned task added during the sprint. t-tooling Issues with this label are in the ownership of the tooling team.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants