Skip to content

Migrate from legacy release branch to tag-based releases #30

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
scc-tw merged 9 commits into from
Nov 15, 2025
Merged

Migrate from legacy release branch to tag-based releases #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
715a1a7
Initial plan
Copilot Nov 15, 2025
da4bd36
Remove release branch ignore rule from CI workflow
Copilot Nov 15, 2025
11d77c3
Add release migration guide and bump version to 1.0.2
Copilot Nov 15, 2025
5a19455
Add automation script for completing release migration
Copilot Nov 15, 2025
aaa69a9
Improve error handling in migration script
Copilot Nov 15, 2025
326fe37
Add safety checks to migration script for existing tags and uncommitt…
Copilot Nov 15, 2025
9e8561d
Make migration script more maintainable with configurable variables
Copilot Nov 15, 2025
a0a75d0
Add comprehensive migration summary document
Copilot Nov 15, 2025
95739a3
Remove redundant markdown documentation files
Copilot Nov 15, 2025
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: CI

on:
push:
branches-ignore:
- release

# This is what will cancel the workflow
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "cg"
version = "1.0.1"
version = "1.0.2"
description = ""
authors = ["scc <scc@teamt5.org>"]
license = "GPL3"
Expand Down
85 changes: 85 additions & 0 deletions scripts/complete-release-migration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
#!/bin/bash
# Complete Release Migration Script
# Run this after the PR is merged to main

set -euo pipefail

# Configuration
REPO_OWNER="scc-tw"
REPO_NAME="cg"
TAG_VERSION="v1.0.2"
TAG_MESSAGE="Release v1.0.2 - Migrate to modern release workflow"

echo "=== Release Migration Script ==="
echo ""
echo "This script will:"
echo "1. Delete the legacy release branch"
echo "2. Create a ${TAG_VERSION} tag on main to trigger a release"
echo ""
echo "Prerequisites:"
echo "- The PR with CI changes and version bump must be merged to main"
echo "- You must have push access to the repository"
echo ""
echo "Press Ctrl+C to cancel, or press Enter to continue..."
read -r

# Ensure we're on main and up to date
echo ""
echo "Step 1: Updating main branch..."

# Check for uncommitted changes
if ! git diff --quiet || ! git diff --staged --quiet; then
echo "Error: You have uncommitted changes in your working directory."
echo "Please commit or stash your changes before running this script."
exit 1
fi

git checkout main
git pull origin main

# Delete the remote release branch
echo ""
echo "Step 2: Deleting remote release branch..."
if git ls-remote --exit-code --heads origin release >/dev/null 2>&1; then
git push origin --delete release
echo "✓ Remote release branch deleted"
else
echo "Note: Remote release branch does not exist or was already deleted"
fi

# Delete local release branch if it exists
if git show-ref --verify --quiet refs/heads/release; then
echo "Deleting local release branch..."
git branch -D release
fi

# Create and push the tag
echo ""
echo "Step 3: Creating ${TAG_VERSION} tag..."

# Check if tag already exists
if git rev-parse "${TAG_VERSION}" >/dev/null 2>&1; then
echo "Error: Tag ${TAG_VERSION} already exists."
echo "If you want to recreate it, delete it first with: git tag -d ${TAG_VERSION} && git push origin :${TAG_VERSION}"
exit 1
fi

git tag -a "${TAG_VERSION}" -m "${TAG_MESSAGE}"

echo ""
echo "Step 4: Pushing tag to trigger release workflow..."
git push origin "${TAG_VERSION}"

echo ""
echo "=== Migration Complete! ==="
echo ""
echo "✓ Legacy release branch deleted"
echo "✓ Tag ${TAG_VERSION} created and pushed"
echo ""
echo "Next steps:"
echo "1. Go to https://github.com/${REPO_OWNER}/${REPO_NAME}/actions to monitor the release workflow"
echo "2. Once complete, verify the release at https://github.com/${REPO_OWNER}/${REPO_NAME}/releases"
echo ""
echo "Future releases: Just create and push a tag on main"
echo " git tag -a v1.0.3 -m 'Release v1.0.3'"
echo " git push origin v1.0.3"
Loading