Handle my Gitbutler branch workflow when releasing new versions & bump remaining files to 1.3.0

Author: smitmartijn

Makefile

@@ -3,7 +3,7 @@ CFLAGS=-std=c++17 -Wall -Wextra -O2 -pthread
 LDFLAGS=-lpcap -pthread
 TARGET=whatpulse-pcap-service
 SOURCES=main.cpp captureservice.cpp networkclient.cpp tcpclient.cpp pcapcapturethread.cpp pfringcapturethread.cpp logger.cpp
-VERSION=1.0.2
+VERSION=1.3.0
 
 # Default target
 all: $(TARGET)

main.cpp

@@ -26,7 +26,7 @@
 #include "networkclient.h"
 #include "logger.h"
 
-#define PCAP_SERVICE_VERSION "1.2.0"
+#define PCAP_SERVICE_VERSION "1.3.0"
 
 // Global service instances for signal handler
 std::unique_ptr<CaptureService> g_captureService = nullptr;

release.sh

@@ -58,6 +58,19 @@ if [ ! -f "main.cpp" ]; then
     exit 1
 fi
 
+# Detect if we're on GitButler workspace branch
+CURRENT_BRANCH=$(git branch --show-current)
+USING_GITBUTLER=false
+
+if [ "$CURRENT_BRANCH" = "gitbutler/workspace" ]; then
+    USING_GITBUTLER=true
+    echo "🔀 Detected GitButler workspace branch"
+    echo "   Switching to main branch for release..."
+    git checkout main
+    echo "✅ Switched to main branch"
+    echo ""
+fi
+
 # Get current version from source
 CURRENT_VERSION=$(grep '#define PCAP_SERVICE_VERSION ' main.cpp | awk -F '"' '{print $2}')
 echo "Current version in source: $CURRENT_VERSION"
@@ -76,10 +89,25 @@ else
     echo "✅ Updated PCAP_SERVICE_VERSION to $VERSION"
 fi
 
+# Update version in Makefile
+MAKEFILE_VERSION=$(grep '^VERSION=' Makefile | cut -d'=' -f2)
+echo "Current version in Makefile: $MAKEFILE_VERSION"
+
+if [ "$MAKEFILE_VERSION" = "$VERSION" ] && [ -z "$FORCE_FLAG" ]; then
+    echo "⚠️  Version is already set to $VERSION in Makefile"
+elif [ "$MAKEFILE_VERSION" = "$VERSION" ] && [ -n "$FORCE_FLAG" ]; then
+    echo "⚠️  Version is already set to $VERSION in Makefile (--force specified, continuing)"
+else
+    echo "📝 Updating version in Makefile..."
+    sed -i.bak "s/^VERSION=.*/VERSION=$VERSION/" Makefile
+    rm Makefile.bak
+    echo "✅ Updated Makefile VERSION to $VERSION"
+fi
+
 # Check if there are uncommitted changes
-if ! git diff --quiet main.cpp; then
+if ! git diff --quiet main.cpp Makefile; then
     echo "📦 Committing version update..."
-    git add main.cpp
+    git add main.cpp Makefile
     if [ -n "$FORCE_FLAG" ]; then
         # Force commit even if there might be conflicts
         git commit -m "bump version to $VERSION" || git commit --amend -m "bump version to $VERSION"
@@ -129,6 +157,14 @@ if [ "$PUSH_FLAG" = "--push" ]; then
     echo ""
     echo "✅ Changes pushed! GitHub Actions will now build and release."
     echo "   View progress at: https://github.com/whatpulse/linux-external-pcap-service/actions"
+
+    # Switch back to GitButler if we started there
+    if [ "$USING_GITBUTLER" = true ]; then
+        echo ""
+        echo "🔀 Switching back to GitButler workspace..."
+        git checkout gitbutler/workspace
+        echo "✅ Returned to gitbutler/workspace branch"
+    fi
 else
     echo "Next steps:"
     echo "1. Review the changes: git log --oneline -n 2"
@@ -152,6 +188,13 @@ else
         echo ""
         echo "⚠️  Force mode enabled - this will overwrite existing releases!"
     fi
+
+    # Remind about GitButler if applicable
+    if [ "$USING_GITBUTLER" = true ]; then
+        echo ""
+        echo "⚠️  Currently on main branch (switched from gitbutler/workspace)"
+        echo "   After pushing, run: git checkout gitbutler/workspace"
+    fi
 fi
 
 echo ""