httpcat-cli 0.3.0 → 0.3.1-rc.2

package/.github/workflows/ci.yml

@@ -38,6 +38,9 @@ jobs:
 
       - name: Build
         run: bun run build
+        env:
+          HTTPCAT_ADMIN_COMMANDS: ${{ vars.HTTPCAT_ADMIN_COMMANDS }}
+          AUTHORIZED_WALLETS: ${{ vars.AUTHORIZED_WALLETS }}
 
       - name: Upload coverage reports
         if: matrix.node-version == '20'

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

@@ -95,6 +95,9 @@ jobs:
 
       - name: Build
         run: bun run build
+        env:
+          HTTPCAT_ADMIN_COMMANDS: ${{ vars.HTTPCAT_ADMIN_COMMANDS }}
+          AUTHORIZED_WALLETS: ${{ vars.AUTHORIZED_WALLETS }}
 
       - name: Verify build output
         run: |
@@ -143,6 +146,9 @@ jobs:
 
       - name: Build
         run: bun run build
+        env:
+          HTTPCAT_ADMIN_COMMANDS: ${{ vars.HTTPCAT_ADMIN_COMMANDS }}
+          AUTHORIZED_WALLETS: ${{ vars.AUTHORIZED_WALLETS }}
 
       - name: Publish RC to npm
         run: npm publish --tag rc --access public

package/.github/workflows/release.yml

@@ -523,6 +523,9 @@ jobs:
 
       - name: Build
         run: bun run build
+        env:
+          HTTPCAT_ADMIN_COMMANDS: ${{ vars.HTTPCAT_ADMIN_COMMANDS }}
+          AUTHORIZED_WALLETS: ${{ vars.AUTHORIZED_WALLETS }}
 
       - name: Verify build output
         run: |
@@ -571,6 +574,9 @@ jobs:
 
       - name: Build
         run: bun run build
+        env:
+          HTTPCAT_ADMIN_COMMANDS: ${{ vars.HTTPCAT_ADMIN_COMMANDS }}
+          AUTHORIZED_WALLETS: ${{ vars.AUTHORIZED_WALLETS }}
 
       - name: Publish to npm
         run: npm publish --access public
@@ -764,3 +770,104 @@ jobs:
           echo "Version: ${{ needs.prepare.outputs.version }}"
           echo "npm: https://www.npmjs.com/package/httpcat-cli/v/${{ needs.prepare.outputs.version }}"
           echo "GitHub: https://github.com/${{ github.repository }}/releases/tag/${{ needs.prepare.outputs.tag }}"
+
+  # Job 6: Sync version to develop branch
+  sync-version:
+    name: Sync Version to Develop
+    runs-on: ubuntu-latest
+    needs: [create-release]
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Checkout develop branch
+        run: |
+          git checkout develop
+          git pull origin develop
+
+      - name: Check for new commits in develop
+        id: check-commits
+        run: |
+          # Check if develop has commits that aren't in main
+          COMMITS_AHEAD=$(git rev-list --count origin/main..HEAD 2>/dev/null || echo "0")
+          echo "commits_ahead=$COMMITS_AHEAD" >> $GITHUB_OUTPUT
+          
+          if [ "$COMMITS_AHEAD" -gt 0 ]; then
+            echo "ℹ️  Develop has $COMMITS_AHEAD commit(s) not in main"
+            echo "These will be preserved by rebasing onto main"
+          else
+            echo "✅ Develop has no new commits - can fast-forward to main"
+          fi
+
+      - name: Rebase develop onto main
+        run: |
+          echo "Updating develop to include latest from main..."
+          git fetch origin main
+          
+          # Check if we can fast-forward (no new commits in develop)
+          COMMITS_AHEAD="${{ steps.check-commits.outputs.commits_ahead }}"
+          
+          if [ "$COMMITS_AHEAD" -eq 0 ]; then
+            # Fast-forward: just move develop to main
+            echo "Fast-forwarding develop to main..."
+            git reset --hard origin/main
+          else
+            # Rebase: replay develop's commits on top of main
+            echo "Rebasing develop onto main..."
+            git rebase origin/main || {
+              echo "⚠️  Rebase conflict detected - this shouldn't happen if develop was properly merged"
+              echo "Falling back to reset (this will discard develop-only commits)"
+              git rebase --abort 2>/dev/null || true
+              git reset --hard origin/main
+            }
+          fi
+          echo "✅ Develop updated to include latest from main"
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: Verify package.json version
+        run: |
+          CURRENT_VERSION=$(node -p "require('./package.json').version")
+          RELEASE_VERSION="${{ needs.prepare.outputs.version }}"
+          
+          echo "Current version in package.json: $CURRENT_VERSION"
+          echo "Release version: $RELEASE_VERSION"
+          
+          if [ "$CURRENT_VERSION" != "$RELEASE_VERSION" ]; then
+            echo "Updating package.json version..."
+            npm version "$RELEASE_VERSION" --no-git-tag-version --allow-same-version
+            git add package.json
+            git commit -m "chore: sync version to $RELEASE_VERSION" || echo "No changes to commit"
+          else
+            echo "✅ Version already matches"
+          fi
+
+      - name: Push to develop
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          
+          # Check if there are any changes to push
+          if git diff --quiet origin/develop HEAD; then
+            echo "✅ No changes to push (develop already up to date)"
+          else
+            COMMITS_AHEAD="${{ steps.check-commits.outputs.commits_ahead }}"
+            if [ "$COMMITS_AHEAD" -eq 0 ]; then
+              # Fast-forward push (no force needed)
+              echo "Pushing fast-forward update..."
+              git push origin develop
+            else
+              # Rebase requires force push (but this is safe after rebase)
+              echo "Pushing rebased develop branch..."
+              git push origin develop --force-with-lease
+            fi
+            echo "✅ Develop updated and pushed"
+          fi

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

@@ -1,9 +1,18 @@
 name: Sync Version to Develop
 
 # This workflow runs after a release to reset develop to match main and sync the version
+# It has multiple triggers to ensure it runs reliably:
+# 1. release event (when a release is published)
+# 2. workflow_run (when the release workflow completes - backup trigger)
+# 3. workflow_dispatch (manual trigger)
 on:
   release:
     types: [published]
+  workflow_run:
+    workflows: ["Publish Switch"]
+    types: [completed]
+    branches:
+      - main
   workflow_dispatch:
     inputs:
       version:
@@ -24,6 +33,21 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Setup GitHub CLI
+        if: github.event_name == 'workflow_run'
+        run: |
+          if ! command -v gh &> /dev/null; then
+            type -p curl >/dev/null || (apt update && apt install curl -y)
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
+            && chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
+            && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
+            && apt update \
+            && apt install gh -y
+          fi
+          echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Get version from release
         id: version
         run: |
@@ -32,16 +56,30 @@ jobs:
             VERSION="${{ inputs.version }}"
             echo "✅ Using provided version: $VERSION"
           elif [ -n "${{ github.event.release.tag_name }}" ]; then
+            # Release event trigger
             VERSION="${{ github.event.release.tag_name }}"
             # Remove 'v' prefix if present
             VERSION="${VERSION#v}"
-            echo "✅ Version from release: $VERSION"
+            echo "✅ Version from release event: $VERSION"
+          elif [ "${{ github.event_name }}" == "workflow_run" ]; then
+            # Workflow run trigger - get latest release tag
+            echo "Getting latest release tag..."
+            LATEST_TAG=$(gh api repos/${{ github.repository }}/releases/latest --jq '.tag_name' || echo "")
+            if [ -n "$LATEST_TAG" ]; then
+              VERSION="$LATEST_TAG"
+              # Remove 'v' prefix if present
+              VERSION="${VERSION#v}"
+              echo "✅ Version from latest release: $VERSION"
+            else
+              echo "❌ Could not get latest release tag"
+              exit 1
+            fi
           else
             echo "❌ No version provided and no release event found"
             exit 1
           fi
           echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "✅ Version from release: $VERSION"
+          echo "✅ Final version: $VERSION"
 
       - name: Checkout develop branch
         run: |