Skip to content

fix: make release sync_beta deterministic and bump beta post-release #713

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

Merged
dsarno merged 3 commits into from
Feb 10, 2026
Merged

fix: make release sync_beta deterministic and bump beta post-release #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb54e5e
fix: make release sync to beta deterministic and bump next beta version
dsarno Feb 10, 2026
213ee54
feat: restore client persistence and update notifications
dsarno Feb 10, 2026
03db792
chore: address reviewer nits in sync workflow and update check
dsarno Feb 10, 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
115 changes: 102 additions & 13 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,47 +309,136 @@ jobs:
contents: write
pull-requests: write
steps:
- name: Checkout main
- name: Checkout beta
uses: actions/checkout@v6
with:
ref: main
ref: beta
fetch-depth: 0

- name: Create PR to merge main into beta
id: sync_pr
- name: Prepare sync branch from beta with merged main
id: sync_branch
env:
GH_TOKEN: ${{ github.token }}
NEW_VERSION: ${{ needs.bump.outputs.new_version }}
shell: bash
run: |
set -euo pipefail
# Check if beta is behind main
git fetch origin beta
git config user.name "GitHub Actions"
git config user.email "actions@github.com"

# Fetch both branches so we can build a merge commit in CI.
git fetch origin main beta
if git merge-base --is-ancestor origin/main origin/beta; then
echo "beta is already up to date with main. Skipping PR."
echo "beta is already up to date with main. Skipping sync."
echo "skipped=true" >> "$GITHUB_OUTPUT"
exit 0
fi

SYNC_BRANCH="sync/main-v${NEW_VERSION}-into-beta-${GITHUB_RUN_ID}"
echo "name=$SYNC_BRANCH" >> "$GITHUB_OUTPUT"
echo "skipped=false" >> "$GITHUB_OUTPUT"

git checkout -b "$SYNC_BRANCH" origin/beta

if git merge origin/main --no-ff --no-commit; then
echo "main merged cleanly into sync branch."
else
echo "Merge conflicts detected. Attempting expected conflict resolution for beta version files."
CONFLICTS=$(git diff --name-only --diff-filter=U || true)
if [[ -n "$CONFLICTS" ]]; then
echo "$CONFLICTS"
fi

# Keep beta-side prerelease versions if these files conflict.
for file in MCPForUnity/package.json Server/pyproject.toml; do
if git ls-files -u -- "$file" | grep -q .; then
echo "Keeping beta version for $file"
git checkout --ours -- "$file"
git add "$file"
fi
done

REMAINING=$(git diff --name-only --diff-filter=U || true)
if [[ -n "$REMAINING" ]]; then
echo "Unexpected unresolved conflicts remain:"
echo "$REMAINING"
exit 1
fi
fi

git commit -m "chore: sync main (v${NEW_VERSION}) into beta"

# After releasing X.Y.Z on main, beta should move to X.Y.(Z+1)-beta.1.
IFS='.' read -r MAJOR MINOR PATCH <<< "$NEW_VERSION"
NEXT_PATCH=$((PATCH + 1))
NEXT_BETA_VERSION="${MAJOR}.${MINOR}.${NEXT_PATCH}-beta.1"
echo "beta_version=$NEXT_BETA_VERSION" >> "$GITHUB_OUTPUT"
echo "Setting beta version to $NEXT_BETA_VERSION"

CURRENT_BETA_VERSION=$(jq -r '.version' MCPForUnity/package.json)
if [[ "$CURRENT_BETA_VERSION" != "$NEXT_BETA_VERSION" ]]; then
jq --arg v "$NEXT_BETA_VERSION" '.version = $v' MCPForUnity/package.json > tmp.json
mv tmp.json MCPForUnity/package.json
git add MCPForUnity/package.json
git commit -m "chore: set beta version to ${NEXT_BETA_VERSION} after release v${NEW_VERSION}"
else
echo "Beta version already at target: $NEXT_BETA_VERSION"
fi
Comment on lines +377 to +385
Copy link
Contributor

@coderabbitai coderabbitai bot Feb 10, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash

echo "=== Check Server/pyproject.toml version format ==="
if [ -f "Server/pyproject.toml" ]; then
  cat -n Server/pyproject.toml | head -40
else
  echo "File not found at Server/pyproject.toml"
fi

Repository: CoplayDev/unity-mcp

Length of output: 1835

🏁 Script executed:

#!/bin/bash

echo "=== Check tools/update_versions.py ==="
if [ -f "tools/update_versions.py" ]; then
  cat -n tools/update_versions.py
else
  echo "File not found at tools/update_versions.py"
fi

Repository: CoplayDev/unity-mcp

Length of output: 11660

🏁 Script executed:

#!/bin/bash

echo "=== Examine the sync_beta job in .github/workflows/release.yml ==="
if [ -f ".github/workflows/release.yml" ]; then
  # Get lines around 370-388 for full context
  sed -n '350,400p' .github/workflows/release.yml | cat -n
else
  echo "Workflow file not found"
fi

Repository: CoplayDev/unity-mcp

Length of output: 2653

🏁 Script executed:

#!/bin/bash

echo "=== Check if there are any other version management patterns ==="
rg -n "version\s*=" --type toml --type json | head -20

Repository: CoplayDev/unity-mcp

Length of output: 169

Server/pyproject.toml is not updated to the next beta version, creating a version mismatch on the beta branch.

After this step, MCPForUnity/package.json will be set to X.Y.(Z+1)-beta.1, but Server/pyproject.toml will remain at the release version X.Y.Z. Both files should be updated consistently.

Note: tools/update_versions.py is designed for release versions only and does not support prerelease formats, so it cannot be used directly here. Instead, manually update pyproject.toml with the proper PEP 440 prerelease format.

Suggested fix: also update pyproject.toml 
          CURRENT_BETA_VERSION=$(jq -r '.version' MCPForUnity/package.json)
          if [[ "$CURRENT_BETA_VERSION" != "$NEXT_BETA_VERSION" ]]; then
            jq --arg v "$NEXT_BETA_VERSION" '.version = $v' MCPForUnity/package.json > tmp.json
            mv tmp.json MCPForUnity/package.json
            git add MCPForUnity/package.json
+
+           # Keep pyproject.toml in sync (PEP 440 prerelease format)
+           PYPI_BETA_VERSION="${MAJOR}.${MINOR}.${NEXT_PATCH}b1"
+           sed -i "s/^version = .*/version = \"${PYPI_BETA_VERSION}\"/" Server/pyproject.toml
+           git add Server/pyproject.toml
+
            git commit -m "chore: set beta version to ${NEXT_BETA_VERSION} after release v${NEW_VERSION}"
          else
            echo "Beta version already at target: $NEXT_BETA_VERSION"
          fi
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
CURRENT_BETA_VERSION=$(jq -r '.version' MCPForUnity/package.json)
if [[ "$CURRENT_BETA_VERSION" != "$NEXT_BETA_VERSION" ]]; then
jq --arg v "$NEXT_BETA_VERSION" '.version = $v' MCPForUnity/package.json > tmp.json
mv tmp.json MCPForUnity/package.json
git add MCPForUnity/package.json
git commit -m "chore: set beta version to ${NEXT_BETA_VERSION} after release v${NEW_VERSION}"
else
echo "Beta version already at target: $NEXT_BETA_VERSION"
fi
CURRENT_BETA_VERSION=$(jq -r '.version' MCPForUnity/package.json)
if [[ "$CURRENT_BETA_VERSION" != "$NEXT_BETA_VERSION" ]]; then
jq --arg v "$NEXT_BETA_VERSION" '.version = $v' MCPForUnity/package.json > tmp.json
mv tmp.json MCPForUnity/package.json
git add MCPForUnity/package.json
# Keep pyproject.toml in sync (PEP 440 prerelease format)
PYPI_BETA_VERSION="${MAJOR}.${MINOR}.${NEXT_PATCH}b1"
sed -i "s/^version = .*/version = \"${PYPI_BETA_VERSION}\"/" Server/pyproject.toml
git add Server/pyproject.toml
git commit -m "chore: set beta version to ${NEXT_BETA_VERSION} after release v${NEW_VERSION}"
else
echo "Beta version already at target: $NEXT_BETA_VERSION"
fi
🤖 Prompt for AI Agents 
In @.github/workflows/release.yml around lines 377 - 385, The workflow updates
MCPForUnity/package.json to NEXT_BETA_VERSION but does not update
Server/pyproject.toml, causing a mismatch; modify the release job to also parse
NEXT_BETA_VERSION into a PEP 440 prerelease string and inline-update
Server/pyproject.toml (do not call tools/update_versions.py), e.g., read
NEXT_BETA_VERSION, convert the semver prerelease suffix into PEP 440 format,
replace the version field in Server/pyproject.toml accordingly, git add/commit
the file along with MCPForUnity/package.json, and ensure commit message
references NEW_VERSION and NEXT_BETA_VERSION for clarity.


echo "Pushing sync branch $SYNC_BRANCH"
git push origin "$SYNC_BRANCH"

- name: Create PR to merge sync branch into beta
if: steps.sync_branch.outputs.skipped != 'true'
id: sync_pr
env:
GH_TOKEN: ${{ github.token }}
NEW_VERSION: ${{ needs.bump.outputs.new_version }}
NEXT_BETA_VERSION: ${{ steps.sync_branch.outputs.beta_version }}
SYNC_BRANCH: ${{ steps.sync_branch.outputs.name }}
shell: bash
run: |
set -euo pipefail
PR_URL=$(gh pr create \
--base beta \
--head main \
--head "$SYNC_BRANCH" \
--title "chore: sync main (v${NEW_VERSION}) into beta" \
--body "Automated sync of version bump from main into beta.")
--body "Automated sync of main back into beta after release v${NEW_VERSION}, including beta version set to ${NEXT_BETA_VERSION}.")
echo "pr_url=$PR_URL" >> "$GITHUB_OUTPUT"
PR_NUMBER=$(echo "$PR_URL" | grep -oE '[0-9]+$')
echo "pr_number=$PR_NUMBER" >> "$GITHUB_OUTPUT"
echo "skipped=false" >> "$GITHUB_OUTPUT"

- name: Merge sync PR
if: steps.sync_pr.outputs.skipped != 'true'
if: steps.sync_branch.outputs.skipped != 'true'
env:
GH_TOKEN: ${{ github.token }}
PR_NUMBER: ${{ steps.sync_pr.outputs.pr_number }}
shell: bash
run: |
set -euo pipefail
gh pr merge "$PR_NUMBER" --merge --no-delete-branch

# Best effort: auto-merge if repository settings allow it.
gh pr merge "$PR_NUMBER" --merge --auto --delete-branch || true

# Retry direct merge for up to 2 minutes while checks settle.
for i in {1..24}; do
STATE=$(gh pr view "$PR_NUMBER" --json state -q '.state')
if [[ "$STATE" == "MERGED" ]]; then
echo "Sync PR merged successfully."
exit 0
fi

if gh pr merge "$PR_NUMBER" --merge --delete-branch >/dev/null 2>&1; then
echo "Sync PR merged successfully."
exit 0
fi

echo "Waiting for sync PR to become mergeable... (state: $STATE)"
sleep 5
done

echo "Sync PR did not merge in time."
gh pr view "$PR_NUMBER" --json state,mergeStateStatus,isDraft -q '{state: .state, mergeStateStatus: .mergeStateStatus, isDraft: .isDraft}'
exit 1

publish_docker:
name: Publish Docker image
Expand Down
Loading