Repository navigation
Conversation
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
conda-forge feedstock updatejob fails on rel-v9r0 releases (last one: 9.0.27, run), before the feedstock PR is even created:conda-forge/release names the PR branch
DIRACGridBot/update-feedstock-versionfor the default feedstock branch (integration releases) andDIRACGridBot/update-feedstock-version/v9.0.xwhenfeedstock-branchis 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-nestedbranch:.Once the push works, the job would hit the same automerge bug as integration (#8820): v2026.9.15 calls
gh pr editwithout--repo. So this also pins conda-forge/release#19 (47ce4c6, merged onmain, 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