httpcat-cli 0.2.1-rc.4 → 0.2.2-rc.1

package/.github/workflows/publish-switch.yml

@@ -30,9 +30,15 @@ jobs:
       contents: read
 
   publish-release:
+    # Skip if commit message is a version bump (to prevent infinite loop)
     if: |
-      (github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))) ||
-      github.event_name == 'workflow_dispatch'
+      github.event_name == 'workflow_dispatch' ||
+      startsWith(github.ref, 'refs/tags/v') ||
+      (github.event_name == 'push' && 
+       github.ref == 'refs/heads/main' && 
+       (!github.event.head_commit || 
+        (!startsWith(github.event.head_commit.message, 'chore: bump version') &&
+         !startsWith(github.event.head_commit.message, 'chore: sync version'))))
     uses: ./.github/workflows/release.yml
     with:
       version: ${{ github.event.inputs.version }}

package/.github/workflows/release.yml

@@ -271,6 +271,31 @@ jobs:
             echo "✅ Tag $TAG created and pushed"
           fi
 
+      - name: Commit version update back to main
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        run: |
+          CURRENT_VERSION=$(node -p "require('./package.json').version")
+          RELEASE_VERSION="${{ steps.version.outputs.version }}"
+          
+          if [ "$CURRENT_VERSION" != "$RELEASE_VERSION" ]; then
+            echo "⚠️  Version mismatch: package.json has $CURRENT_VERSION but release is $RELEASE_VERSION"
+            echo "This shouldn't happen - the version should have been updated earlier in the workflow"
+            exit 1
+          fi
+          
+          # Check if package.json has uncommitted changes
+          if git diff --quiet package.json; then
+            echo "✅ package.json version already committed"
+          else
+            echo "Committing version update to main..."
+            git config user.name "github-actions[bot]"
+            git config user.email "github-actions[bot]@users.noreply.github.com"
+            git add package.json
+            git commit -m "chore: bump version to $RELEASE_VERSION"
+            git push origin main
+            echo "✅ Version update committed to main"
+          fi
+
       - name: Generate release notes
         id: notes
         uses: actions/github-script@v8
@@ -520,7 +545,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           repository: hathbanger/homebrew-httpcat
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.HOMEBREW_TAP_TOKEN }}
           path: homebrew-tap
 
       - name: Wait for npm CDN propagation
@@ -575,7 +600,8 @@ jobs:
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git add Formula/httpcat.rb
           git commit -m "Update httpcat to ${{ needs.prepare.outputs.version }}" || exit 0
-          git push
+          git remote set-url origin https://${{ secrets.HOMEBREW_TAP_TOKEN }}@github.com/hathbanger/homebrew-httpcat.git
+          git push origin main
 
   # Job 5: Create GitHub Release
   create-release:

package/.github/workflows/sync-version.yml

@@ -0,0 +1,56 @@
+name: Sync Version to Develop
+
+# This workflow runs after a release to sync the version from main back to develop
+on:
+  release:
+    types: [published]
+
+jobs:
+  sync-version:
+    name: Sync version to develop
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version from release
+        id: version
+        run: |
+          VERSION="${{ github.event.release.tag_name }}"
+          # Remove 'v' prefix if present
+          VERSION="${VERSION#v}"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "✅ Version to sync: $VERSION"
+
+      - name: Checkout develop branch
+        run: |
+          git checkout develop
+          git pull origin develop
+
+      - name: Update package.json version
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          npm version "$VERSION" --no-git-tag-version --allow-same-version
+          echo "✅ Updated package.json to version $VERSION"
+
+      - name: Commit and push to develop
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add package.json
+          
+          # Check if there are changes to commit
+          if git diff --staged --quiet; then
+            echo "✅ package.json already at version $VERSION, nothing to commit"
+          else
+            git commit -m "chore: sync version to $VERSION"
+            git push origin develop
+            echo "✅ Version synced to develop"
+          fi
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "httpcat-cli",
-  "version": "0.2.1-rc.4",
+  "version": "0.2.2-rc.1",
   "description": "CLI tool for interacting with httpcat agent - create, buy, and sell tokens with x402 payments",
   "main": "dist/index.js",
   "bin": {