Skip to content

Merge v4-beta to v4 (2026-05-25) #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dbolotin wants to merge 2 commits into
base: v4
Choose a base branch
from
Open

Merge v4-beta to v4 (2026-05-25) #167

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f7eba7
Add fix-beta.sh: re-sync v4-beta with v4 (inverse of merge-beta.sh)
dbolotin May 25, 2026
a3e1b2c
Merge v4-beta into v4
dbolotin May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 86 additions & 0 deletions fix-beta.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
#!/bin/bash
#
# fix-beta.sh — re-sync v4-beta with v4 after they diverge.
#
# Use when:
# - Someone committed directly to v4 (bypassing the v4-beta → merge-beta.sh
# cycle) and you want v4-beta to incorporate those changes.
# - Post-promotion: v4 has the rename-sed commit from merge-beta.sh that
# v4-beta does not have; run this script to bring v4-beta back in sync.
#
# What it does:
# 1. Refuses if the working tree is dirty.
# 2. Re-execs itself from a tmp copy so the script survives the checkout.
# 3. Switches to v4-beta, pulls latest.
# 4. Merges v4 in with --strategy-option theirs (v4 content wins on conflict).
# 5. Sed-flips @v4 -> @v4-beta across action.yaml + .github/workflows/*.yaml
# (mirrors merge-beta.sh's file scope, opposite direction).
# 6. Commits the flip on top of the merge commit and pushes.
#
# Inverse of merge-beta.sh.
#
# Sed safety: @v4 is a prefix of @v4-beta. Naive `s|@v4|@v4-beta|g` would
# produce @v4-beta-beta. Two scoped patterns are used instead: match @v4 at
# end-of-line, and @v4 followed by whitespace.

set -o nounset
set -o errexit
set -o pipefail

: ${TARGET_BRANCH:="v4-beta"} # branch being fixed
: ${SOURCE_BRANCH:="v4"} # branch being merged in

if git status --porcelain | grep -q .; then
echo ""
echo "# -------------------------------------------------------------- #"
echo "# Repository has local changes. Automatic merge is not possible. #"
echo "# -------------------------------------------------------------- #"
echo ""
git status --porcelain
exit 1
fi

if [ "${__REAL_RUN:-}" != "true" ]; then
echo "Copying script to temporary file to not lose original code during checkouts..."
tmp_script="$(mktemp)"
cat "${0}" > "${tmp_script}"
chmod +x "${tmp_script}"
__REAL_RUN="true" "${tmp_script}"
exit 0
Comment on lines +45 to +49
Copy link
Copy Markdown

@greptile-apps greptile-apps Bot May 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 The temp file created by mktemp is never removed. If ${tmp_script} fails mid-run (e.g., merge conflict, push rejected), the script exits via set -e and the file lingers in /tmp. Adding a trap immediately after the mktemp call ensures cleanup on any exit. The same gap exists in merge-beta.sh.

Suggested change
tmp_script="$(mktemp)"
cat "${0}" > "${tmp_script}"
chmod +x "${tmp_script}"
__REAL_RUN="true" "${tmp_script}"
exit 0
tmp_script="$(mktemp)"
trap "rm -f \"${tmp_script}\"" EXIT
cat "${0}" > "${tmp_script}"
chmod +x "${tmp_script}"
__REAL_RUN="true" "${tmp_script}"
exit 0
Prompt To Fix With AI 
This is a comment left during a code review.
Path: fix-beta.sh
Line: 45-49

Comment:
The temp file created by `mktemp` is never removed. If `${tmp_script}` fails mid-run (e.g., merge conflict, push rejected), the script exits via `set -e` and the file lingers in `/tmp`. Adding a `trap` immediately after the `mktemp` call ensures cleanup on any exit. The same gap exists in `merge-beta.sh`.

```suggestion
    tmp_script="$(mktemp)"
    trap "rm -f \"${tmp_script}\"" EXIT
    cat "${0}" > "${tmp_script}"
    chmod +x "${tmp_script}"
    __REAL_RUN="true" "${tmp_script}"
    exit 0
```

How can I resolve this? If you propose a fix, please make it concise.

fi

echo "Updating remote repository info..."
git fetch --prune origin

echo "Switching to '${TARGET_BRANCH}'..."
git checkout "${TARGET_BRANCH}"
git pull --ff-only

echo "Merging 'origin/${SOURCE_BRANCH}' into '${TARGET_BRANCH}' (theirs wins on conflict)..."
git merge \
--no-edit \
--message "Merge ${SOURCE_BRANCH} into ${TARGET_BRANCH}" \
"origin/${SOURCE_BRANCH}" \
--strategy-option theirs

echo "Flipping @${SOURCE_BRANCH} -> @${TARGET_BRANCH} in action.yaml and workflows..."
{
find . -type f -name "action.yaml"
find .github/workflows -type f -name "*.yaml"
} |
while read -r file; do
sed "s|@${SOURCE_BRANCH}\$|@${TARGET_BRANCH}|g; s|@${SOURCE_BRANCH}\([[:space:]]\)|@${TARGET_BRANCH}\1|g" "${file}" > "${file}.tmp"
mv "${file}.tmp" "${file}"
done

if git diff --quiet; then
echo "No ref flips needed; merge alone was sufficient."
else
git add -A
git commit -m "Re-flip @${SOURCE_BRANCH} -> @${TARGET_BRANCH} after merging ${SOURCE_BRANCH}"
fi

echo "Pushing '${TARGET_BRANCH}'..."
git push origin "${TARGET_BRANCH}"

echo "Done. ${TARGET_BRANCH} is now in sync with ${SOURCE_BRANCH}, with internal refs restored to @${TARGET_BRANCH}."