Fix expand-terraform: use PR head branch for push#89
Merged
Conversation
github.ref_name on PRs returns "1/merge" (merge ref number), not the branch name. Use github.head_ref for PRs (the actual branch), falling back to github.ref_name for push events. Pass via env var to avoid command injection from user-controlled branch names.
Terraform Plan✅ No changes — infrastructure is up to date. Plan output |
Alexanderamiri
added a commit
that referenced
this pull request
Mar 17, 2026
Same fix as expand-terraform (PR #89). When expand pushes regenerated files to the PR branch, tf-plan must checkout the updated branch HEAD, not the stale merge ref captured at workflow trigger time.
1 task
Alexanderamiri
added a commit
that referenced
this pull request
Mar 17, 2026
## Summary Same fix as #89 but for `tf-plan.yml`. When `expand-terraform` pushes regenerated files to the PR branch, `tf-plan` must checkout the updated branch HEAD (`github.head_ref`), not the stale merge ref (`github.ref`) captured at workflow trigger time. Without this, tf-plan validates against old generated files that don't reflect app.yaml changes. ## Test plan - [ ] Merge this, then re-run test app PR CI
Alexanderamiri
added a commit
that referenced
this pull request
May 9, 2026
## Summary - Use `github.head_ref` (PR branch name) instead of `github.ref_name` (returns `1/merge` for PRs) - Pass branch via env var to prevent command injection from user-controlled branch names - Fixes the test app CI failure where `commit-generated-tf.sh` tried to push to `1/merge` ## Test plan - [ ] Merge this, then re-run test app PR CI
Alexanderamiri
added a commit
that referenced
this pull request
May 9, 2026
## Summary Same fix as #89 but for `tf-plan.yml`. When `expand-terraform` pushes regenerated files to the PR branch, `tf-plan` must checkout the updated branch HEAD (`github.head_ref`), not the stale merge ref (`github.ref`) captured at workflow trigger time. Without this, tf-plan validates against old generated files that don't reflect app.yaml changes. ## Test plan - [ ] Merge this, then re-run test app PR CI
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
1 participant
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.
Summary
github.head_ref(PR branch name) instead ofgithub.ref_name(returns1/mergefor PRs)commit-generated-tf.shtried to push to1/mergeTest plan