fix(release): create tag after commit amend to prevent tag drift

Author: leefowlercu

scripts/prepare-release.sh

@@ -207,16 +207,10 @@ COMMIT_MESSAGE="release: prepare ${VERSION}"
 git commit -m "$COMMIT_MESSAGE"
 echo -e "${GREEN}Created commit: $COMMIT_MESSAGE${NC}"
 
-# Create annotated tag
-echo -e "${YELLOW}Creating git tag ${VERSION}...${NC}"
-git tag -a "$VERSION" -m "Go ContextForge SDK $VERSION"
-echo -e "${GREEN}Created annotated tag: $VERSION${NC}"
-
-# Check for GoReleaser and GITHUB_TOKEN
+# Check for GoReleaser and GITHUB_TOKEN (before creating tag)
 if ! command -v goreleaser &> /dev/null; then
     echo -e "${RED}Error: goreleaser is not installed${NC}"
     echo -e "${YELLOW}Install with: go install github.com/goreleaser/goreleaser/v2@latest${NC}"
-    git tag -d "$VERSION"
     git reset --hard HEAD~1
     exit 1
 fi
@@ -229,8 +223,7 @@ if [ -z "$GITHUB_TOKEN" ]; then
     echo -e "${YELLOW}Continue anyway? Release will fail but you can retry later. (y/N)${NC}"
     read -r response
     if [[ ! "$response" =~ ^[Yy]$ ]]; then
-        echo -e "${YELLOW}Undoing tag and commit...${NC}"
-        git tag -d "$VERSION"
+        echo -e "${YELLOW}Undoing commit...${NC}"
         git reset --hard HEAD~1
         exit 1
     fi
@@ -240,8 +233,7 @@ fi
 echo -e "${YELLOW}Running GoReleaser...${NC}"
 if ! goreleaser release --clean; then
     echo -e "${RED}Error: GoReleaser failed${NC}"
-    echo -e "${YELLOW}Undoing tag and commit...${NC}"
-    git tag -d "$VERSION"
+    echo -e "${YELLOW}Undoing commit...${NC}"
     git reset --hard HEAD~1
     exit 1
 fi
@@ -252,8 +244,7 @@ echo -e "${GREEN}GoReleaser completed successfully!${NC}"
 echo -e "${YELLOW}Merging changelog...${NC}"
 if ! merge_changelog "$VERSION"; then
     echo -e "${RED}Error: Changelog merge failed${NC}"
-    echo -e "${YELLOW}Undoing tag and commit...${NC}"
-    git tag -d "$VERSION"
+    echo -e "${YELLOW}Undoing commit...${NC}"
     git reset --hard HEAD~1
     exit 1
 fi
@@ -265,6 +256,11 @@ git add CHANGELOG.md
 git commit --amend --no-edit
 echo -e "${GREEN}Updated release commit with changelog${NC}"
 
+# Create annotated tag (after commit is amended so tag points to final commit)
+echo -e "${YELLOW}Creating git tag ${VERSION}...${NC}"
+git tag -a "$VERSION" -m "Go ContextForge SDK $VERSION"
+echo -e "${GREEN}Created annotated tag: $VERSION${NC}"
+
 # Display next steps
 echo ""
 echo -e "${GREEN}========================================${NC}"
@@ -287,8 +283,9 @@ echo "   https://github.com/leefowlercu/go-contextforge/releases"
 echo ""
 echo "3. If changes needed:"
 echo "   - Edit CHANGELOG.md locally and/or release notes on GitHub"
-echo "   - Amend commit: git add CHANGELOG.md && git commit --amend --no-edit"
-echo "   - Update tag: git tag -fa $VERSION -m \"Go ContextForge SDK $VERSION\""
+echo "   - Amend commit and update tag:"
+echo "     git add CHANGELOG.md && git commit --amend --no-edit"
+echo "     git tag -fa $VERSION -m \"Go ContextForge SDK $VERSION\""
 echo "   - OR undo completely: git tag -d $VERSION && git reset --hard HEAD~1"
 echo ""
 echo "4. When ready to publish:"