Refactor/history cleanup (#111)

* Move appcast to dedicated branch

* Refactor: Inline version bumping and streamline release process in CI workflow

* Move site to gh-pages branch

* Quick fixes

Author: NullPointerDepressiveDisorder

.github/workflows/_get-version.yml

@@ -81,38 +81,44 @@ jobs:
           PROJECT_VERSION=$(sed -nE 's/.*MARKETING_VERSION = ([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?);.*/\1/p' MiddleDrag.xcodeproj/project.pbxproj | head -n 1)
 
           if [ "$VERSION" != "$PROJECT_VERSION" ]; then
-            echo "Version mismatch ($PROJECT_VERSION vs $VERSION). Bumping..."
+            echo "Version mismatch ($PROJECT_VERSION vs $VERSION). Bumping on releases branch..."
             echo "kill-pipeline=true" >> $GITHUB_OUTPUT
 
-            # Determine the branch to update
-            if [[ "$GITHUB_REF" == refs/heads/* ]]; then
-              BRANCH_NAME=${GITHUB_REF#refs/heads/}
-            else
-              BRANCH_NAME="main"
-              echo "Tag push detected, using $BRANCH_NAME"
-            fi
+            # Create a detached release commit based on current main content
+            git checkout --detach HEAD
 
-            git fetch origin "$BRANCH_NAME"
-            git checkout -b "version-bump-$VERSION"
+            # Bump version inline (replaces bump-version.sh for CI)
+            sed -i '' -E "s/MARKETING_VERSION = [0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?/MARKETING_VERSION = $VERSION/g" \
+              MiddleDrag.xcodeproj/project.pbxproj
 
-            NOTES="${{ inputs.notes }}"
-            ./bump-version.sh "$VERSION" "$NOTES"
+            COUNT=$(grep -c "MARKETING_VERSION = $VERSION" MiddleDrag.xcodeproj/project.pbxproj || echo "0")
+            if [ "$COUNT" -ne 2 ]; then
+              echo "Error: Expected exactly 2 MARKETING_VERSION updates, found $COUNT"
+              exit 1
+            fi
 
-            # Rebase on latest main in case of new commits
-            git fetch origin "$BRANCH_NAME"
-            git rebase "origin/$BRANCH_NAME"
+            git add MiddleDrag.xcodeproj/project.pbxproj
+            git commit -m "Release v$VERSION"
 
-            # Update main branch to point to new commit
-            git checkout "$BRANCH_NAME"
-            git reset --hard "version-bump-$VERSION"
+            NEW_SHA=$(git rev-parse HEAD)
 
-            # Re-create the tag to point to HEAD after rebase
-            git tag -f -a "v$VERSION" -m "$(git tag -l --format='%(contents)' "v$VERSION" 2>/dev/null || echo "Release v$VERSION")"
+            # Point the releases branch at this commit
+            git branch -f releases HEAD
+            git push origin releases --force
 
-            git push origin "$BRANCH_NAME" --force-with-lease
+            # Re-create the tag to point to the release commit
+            NOTES="${{ inputs.notes }}"
+            TAG_MSG=$(git tag -l --format='%(contents)' "v$VERSION" 2>/dev/null || echo "")
+            if [ -n "$NOTES" ]; then
+              TAG_MSG="$NOTES"
+            elif [ -z "$TAG_MSG" ]; then
+              TAG_MSG="Release v$VERSION"
+            fi
+            git tag -f -a "v$VERSION" -m "$TAG_MSG"
             git push origin "v$VERSION" --force
 
-            echo "NEW_SHA=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+            echo "NEW_SHA=$NEW_SHA" >> $GITHUB_OUTPUT
+            echo "✓ Release commit created on 'releases' branch (main untouched)"
           else
             echo "Version matches. Proceeding..."
             echo "NEW_SHA=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT

.github/workflows/deploy-site.yml

@@ -2,7 +2,7 @@ name: Deploy Website
 
 on:
   push:
-    branches: ["main", "webpage"] # Targeting current working branches
+    branches: ["gh-pages"] # Targeting current working branches
   workflow_dispatch:
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages

.github/workflows/update-appcast.yml

@@ -29,6 +29,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           token: ${{ steps.app-token.outputs.token }}
+          ref: appcast
 
       - name: Determine version
         id: version

MiddleDrag/Info.plist

@@ -31,7 +31,7 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>SUFeedURL</key>
-	<string>https://raw.githubusercontent.com/nullpointerdepressivedisorder/MiddleDrag/main/appcast.xml</string>
+	<string>https://raw.githubusercontent.com/nullpointerdepressivedisorder/MiddleDrag/appcast/appcast.xml</string>
 	<key>SUPublicEDKey</key>
 	<string>$(SPARKLE_PUBLIC_KEY)</string>
 </dict>