Skip to content

[v9.0] fix: unblock the conda-forge feedstock update - #8825

Closed
aldbr wants to merge 1 commit into
DIRACGrid:rel-v9r0from
aldbr:fix/conda-forge-release-rel-v9r0
Closed

aldbr wants to merge 1 commit into
DIRACGrid:rel-v9r0from
aldbr:fix/conda-forge-release-rel-v9r0

Conversation

@aldbr

@aldbr aldbr commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

The conda-forge feedstock update job fails on rel-v9r0 releases (last one: 9.0.27, run), before the feedstock PR is even created:

! [remote rejected] DIRACGridBot/update-feedstock-version/v9.0.x -> DIRACGridBot/update-feedstock-version/v9.0.x (directory file conflict)

conda-forge/release names the PR branch DIRACGridBot/update-feedstock-version for the default feedstock branch (integration releases) and DIRACGridBot/update-feedstock-version/v9.0.x when feedstock-branch is set. Git cannot hold both refs, and the first one exists in the DIRACGridBot fork, so every rel-v9r0 push is rejected. This sets an explicit non-nested branch:.

Once the push works, the job would hit the same automerge bug as integration (#8820): v2026.9.15 calls gh pr edit without --repo. So this also pins conda-forge/release#19 (47ce4c6, merged on main, not tagged yet; the only other change since v2026.9.15 is a README note).

Same fix for rel-v8r0 and rel-v9r0; integration only needs the pin (#8820), hence sweep:ignore.

BEGINRELEASENOTES
*CI
FIX: conda-forge feedstock update for maintenance releases (PR branch name conflict, automerge label)
ENDRELEASENOTES

🤖 Generated with Claude Code

Two failures in the conda-forge/release action stop the feedstock update:

- The push of the PR branch to the DIRACGridBot fork is rejected with
  "directory file conflict": the default branch name for a maintenance
  feedstock branch, DIRACGridBot/update-feedstock-version/v9.0.x, cannot
  coexist with the DIRACGridBot/update-feedstock-version branch used by
  the integration releases. Set an explicit, non-nested branch name.
- v2026.9.15 runs `gh pr edit` without --repo outside a git checkout, so
  adding the automerge label fails. Pin conda-forge/release#19, which
  fixes it (not in a tagged release yet).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@aldbr
aldbr requested a review from fstagni as a code owner October 9, 2026 07:07
@aldbr aldbr added the sweep:ignore Prevent sweeping from being ran for this PR label Oct 9, 2026
@aldbr
aldbr requested a review from atsareg as a code owner October 9, 2026 07:07
@aldbr aldbr added the sweep:ignore Prevent sweeping from being ran for this PR label Oct 9, 2026
@aldbr aldbr closed this Oct 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

sweep:ignore Prevent sweeping from being ran for this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant