cherrypick-interactive 1.6.0 → 1.7.0

package/.github/workflows/release.yml

@@ -0,0 +1,107 @@
+name: Release & Publish
+
+on:
+  push:
+    branches: [main]
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          registry-url: https://registry.npmjs.org
+
+      - name: Get current version
+        id: current
+        run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
+
+      - name: Determine version bump from commits
+        id: bump
+        run: |
+          # Get commits since last tag (or all commits if no tags)
+          LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+
+          if [ -z "$LAST_TAG" ]; then
+            COMMITS=$(git log --pretty=format:"%s" HEAD)
+          else
+            COMMITS=$(git log --pretty=format:"%s" "${LAST_TAG}..HEAD")
+          fi
+
+          if [ -z "$COMMITS" ]; then
+            echo "bump=none" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          BUMP="none"
+
+          # Check for breaking changes (major)
+          if echo "$COMMITS" | grep -qE "^[a-z]+(\(.+\))?!:"; then
+            BUMP="major"
+          # Check for feat (minor)
+          elif echo "$COMMITS" | grep -qE "^feat(\(.+\))?:"; then
+            BUMP="minor"
+          # Check for fix, refactor, perf, etc. (patch)
+          elif echo "$COMMITS" | grep -qE "^(fix|refactor|perf|chore|docs|style|test|ci)(\(.+\))?:"; then
+            BUMP="patch"
+          fi
+
+          echo "bump=$BUMP" >> $GITHUB_OUTPUT
+
+      - name: Bump version
+        if: steps.bump.outputs.bump != 'none'
+        id: version
+        run: |
+          BUMP=${{ steps.bump.outputs.bump }}
+          CURRENT=${{ steps.current.outputs.version }}
+
+          IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT"
+
+          case "$BUMP" in
+            major) MAJOR=$((MAJOR + 1)); MINOR=0; PATCH=0 ;;
+            minor) MINOR=$((MINOR + 1)); PATCH=0 ;;
+            patch) PATCH=$((PATCH + 1)) ;;
+          esac
+
+          NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}"
+          echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
+
+          # Update package.json
+          node -e "
+            const pkg = require('./package.json');
+            pkg.version = '${NEW_VERSION}';
+            require('fs').writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
+          "
+
+          echo "Version: $CURRENT → $NEW_VERSION ($BUMP)"
+
+      - name: Publish to npm
+        if: steps.bump.outputs.bump != 'none'
+        run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Commit version bump and tag
+        if: steps.bump.outputs.bump != 'none'
+        run: |
+          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(release): v${{ steps.version.outputs.new_version }}"
+          git tag "v${{ steps.version.outputs.new_version }}"
+          git push
+          git push --tags
+
+      - name: Create GitHub Release
+        if: steps.bump.outputs.bump != 'none'
+        run: gh release create "v${{ steps.version.outputs.new_version }}" --generate-notes --title "v${{ steps.version.outputs.new_version }}"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/README.md

@@ -179,61 +179,6 @@ When cherry-picking encounters conflicts, the tool provides an **interactive wiz
 
 ---
 
-## 🪵 Example Run
-
-```bash
-$ cherrypick-interactive --semantic-versioning --version-file ./package.json --create-release --draft-pr
-
-Fetching remotes (git fetch --prune)...
-Comparing subjects since 1 week ago
-Dev:  origin/dev
-Main: origin/main
-
-✔ Select commits to cherry-pick (8 missing):
-  ✔ #86c6105k9 - Add missing ATS configs in plists. (#1077)
-  ✔ chore(deps): bump actions/checkout from 3 to 6 (#1079)
-  ✔ #86c6q8y5r - Separete Corporate and Individual Registration (#1081)
-  ✔ #86c5wbbuc - Refactor splash related store initializations (#1082)
-  ✔ #86c6x2u20 - Remove deprecated reward center components (#1085)
-  ✔ #0 - Upgrade ruby version in workflows. (#1087)
-
-↷ Semver ignored (pattern: /bump/i): (chore(deps): bump actions/checkout from 3 to 6 (#1079))
-↷ Semver ignored (pattern: /bump/i): (#86c5wbbuc - Refactor splash related store initializations (#1082))
-
-Semantic Versioning
-  Current: 4.36.0  Detected bump: minor  Next: 4.37.0
-
-Creating release/4.37.0 from origin/main...
-✓ Ready on release/4.37.0. Cherry-picking will apply here.
-
-Cherry-picking 6 commit(s) onto main (oldest → newest)...
-
-✓ cherry-picked (7ba30af) #86c6105k9 - Add missing ATS configs in plists. (#1077)
-✓ cherry-picked (bbc70ed) chore(deps): bump actions/checkout from 3 to 6 (#1079)
-✓ cherry-picked (287dbad) #86c6q8y5r - Separete Corporate and Individual Registration (#1081)
-
-✖ Cherry-pick has conflicts on 8eb07cb78148866d769684730d154e5cbeb2f331 (8eb07cb).
-Conflicted files:
-  - android/app/build.gradle
-  - ios/bilira_wallet.xcodeproj/project.pbxproj
-
-✔ Choose how to proceed: Resolve conflicts now
-✔ Select a file to resolve or a global action: Use theirs for ALL
-
-No conflicted files reported by git.
-✓ cherry-picked (8eb07cb) #86c5wbbuc - Refactor splash related store initializations (#1082)
-✓ cherry-picked (3ae27ee) #86c6x2u20 - Remove deprecated reward center components (#1085)
-✓ cherry-picked (66d0419) #0 - Upgrade ruby version in workflows. (#1087)
-
-Summary → applied: 6, skipped: 0
-
-Updating package.json version → 4.37.0 ...
-✓ package.json updated and committed: chore(release): bump version to 4.37.0
-✅ Pull request created for release/4.37.0 → main
-```
-
----
-
 ## 🧹 Why This Helps
 
 If your team:

package/cli.js

@@ -959,8 +959,13 @@ async function runGh(args) {
     });
 }
 async function readJson(filePath) {
-    const raw = await fsPromises.readFile(filePath, 'utf8');
-    return JSON.parse(raw);
+    try {
+        const raw = await fsPromises.readFile(filePath, 'utf8');
+        return JSON.parse(raw);
+    } catch (e) {
+        if (e.code === 'ENOENT') return null;
+        throw e;
+    }
 }
 
 async function writeJson(filePath, data) {
@@ -968,19 +973,39 @@ async function writeJson(filePath, data) {
     await fsPromises.writeFile(filePath, text, 'utf8');
 }
 
-/** Read package.json version; throw if missing */
+/** Read package.json version; prompt to create file with 0.0.0 if it does not exist */
 async function getPkgVersion(pkgPath) {
-    const pkg = await readJson(pkgPath);
-    const v = pkg?.version;
+    let pkg = await readJson(pkgPath);
+    if (!pkg) {
+        log(chalk.yellow(`⚠ ${pkgPath} not found.`));
+        const { shouldCreate } = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'shouldCreate',
+                message: `Create ${pkgPath} with version 0.0.0?`,
+                default: true,
+            },
+        ]);
+        if (!shouldCreate) {
+            throw new Error(`Version file ${pkgPath} does not exist. Aborting.`);
+        }
+        pkg = { "version": "0.0.0" };
+        await writeJson(pkgPath, pkg);
+        log(chalk.green(`✓ Created ${pkgPath} with version 0.0.0`));
+    }
+    const v = pkg.version;
     if (!v) {
         throw new Error(`No "version" field found in ${pkgPath}`);
     }
     return v;
 }
 
-/** Update package.json version in-place */
+/** Update package.json version in-place; create file if it does not exist */
 async function setPkgVersion(pkgPath, nextVersion) {
-    const pkg = await readJson(pkgPath);
+    let pkg = await readJson(pkgPath);
+    if (!pkg) {
+        pkg = {};
+    }
     pkg.version = nextVersion;
     await writeJson(pkgPath, pkg);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cherrypick-interactive",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Interactively cherry-pick commits that are in dev but not in main, using subject-based comparison.",
   "main": "cli.js",
   "bin": "cli.js",