fix: VARLOCK_BRANCH returns merge ref instead of head branch in GitHub Actions PR context#566
Merged
philmillman merged 2 commits intomainfrom Apr 8, 2026
Merged
Conversation
🦋 Changeset detectedLatest commit: 90ea395 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Agent-Logs-Url: https://github.com/dmno-dev/varlock/sessions/c8cfa267-de22-4eba-a7a7-0a9019ce4622 Co-authored-by: philmillman <3722211+philmillman@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix VARLOCK_BRANCH defaults in GitHub Actions PR workflows
fix: VARLOCK_BRANCH returns merge ref instead of head branch in GitHub Actions PR context
Apr 8, 2026
theoephraim
approved these changes
Apr 8, 2026
commit: |
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.
In GitHub Actions PR workflows,
GITHUB_REFisrefs/pull/123/merge— not a branch name.VARLOCK_BRANCHwas resolving to this merge ref instead of the actual head branch (e.g.feat-init-infra).Changes
ci-env-info/src/platforms.ts: GitHub Actionsbranchextractor now usesGITHUB_HEAD_REF || refToBranch(GITHUB_REF).GITHUB_HEAD_REFis set to the PR head branch name in PR contexts; empty otherwise, so push events fall back to the existing behavior.ci-env-info/src/normalize.ts:refToBranch()now returnsundefinedforrefs/pull/refs — the existing comment already documented this intent but the implementation didn't match.getCiEnvGitHub Actions PR case and theVARLOCK_BRANCHbuiltin var in PR context.Before / After: