zx-bulk-release 3.1.4 → 3.1.5

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.1.5](https://github.com/semrel-extra/zx-bulk-release/compare/v3.1.4...v3.1.5) (2026-04-13)
+
+### Fixes & improvements
+* fix: make git-tag channel work with both local and remote repos ([0102cdd](https://github.com/semrel-extra/zx-bulk-release/commit/0102cddaf6c091e8cc68533be8034f95776c64b4))
+* fix: use package name and version in parcel names ([6b5f1e7](https://github.com/semrel-extra/zx-bulk-release/commit/6b5f1e761c9821460267c1464db01af1029dbaa7))
+* fix: enable git-tag and semaphore in bare deliver repo ([abe82d9](https://github.com/semrel-extra/zx-bulk-release/commit/abe82d9b299a489ce16c0a9f3867894657b4e2a4))
+
 ## [3.1.4](https://github.com/semrel-extra/zx-bulk-release/compare/v3.1.3...v3.1.4) (2026-04-13)
 
 ### Fixes & improvements

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zx-bulk-release",
   "alias": "bulk-release",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "zx-based alternative for multi-semantic-release",
   "type": "module",
   "exports": {

package/src/main/js/post/api/gh.js

@@ -1,6 +1,5 @@
 // Low-level GitHub API primitives. No domain knowledge, no imports from processor/ or steps/.
 
-import nodeFs from 'node:fs'
 import {$, path, tempy, glob, fs, fetch} from 'zx-extra'
 import {asArray, attempt2} from '../../util.js'
 
@@ -93,7 +92,7 @@ export const ghGetAsset = async ({repoName, tag, name, ghUrl}) => {
 export const setOutput = (name, value) => {
   const outputFile = process.env.GITHUB_OUTPUT
   if (outputFile) {
-    try { nodeFs.appendFileSync(outputFile, `${name}=${value}\n`) } catch { /* not in CI */ }
+    try { fs.appendFileSync(outputFile, `${name}=${value}\n`) } catch { /* not in CI */ }
   }
 }
 

package/src/main/js/post/api/git.js

@@ -104,12 +104,12 @@ export const getTags = memoizeBy(
   async (cwd, ref = '*') => `${await getRoot(cwd)}:${ref}`,
 )
 
-export const pushTag = async ({cwd, tag, gitCommitterName, gitCommitterEmail}) => {
+export const pushTag = async ({cwd, tag, sha, gitCommitterName, gitCommitterEmail}) => {
   await setUserConfig(cwd, gitCommitterName, gitCommitterEmail)
 
-  await $({cwd})`
-    git tag -m ${tag} ${tag} &&
-    git push origin ${tag}`
+  const target = sha ? [sha] : []
+  await $({cwd})`git tag -m ${tag} ${tag} ${target}`
+  await $({cwd})`git push origin ${tag}`
 }
 
 // Memoize prevents .git/config lock

package/src/main/js/post/courier/channels/git-tag.js

@@ -1,15 +1,25 @@
+import {$} from 'zx-extra'
 import {api} from '../../api/index.js'
 import {DEFAULT_GIT_COMMITTER_NAME, DEFAULT_GIT_COMMITTER_EMAIL} from '../../api/git.js'
 
 export const isTagConflict = (e) =>
   /already exists|updates were rejected|failed to push/i.test(e?.message || e?.stderr || '')
 
+const ensureSha = async (cwd, sha) => {
+  if (!sha) return
+  const check = await $({cwd, nothrow: true, quiet: true})`git cat-file -e ${sha}`
+  if (check.exitCode !== 0) {
+    await $({cwd, quiet: true})`git fetch origin --depth 1`
+  }
+}
+
 const run = async (manifest, dir) => {
-  const {tag, cwd} = manifest
+  const {tag, sha, cwd} = manifest
   const gitCommitterName  = manifest.gitCommitterName  || DEFAULT_GIT_COMMITTER_NAME
   const gitCommitterEmail = manifest.gitCommitterEmail || DEFAULT_GIT_COMMITTER_EMAIL
   try {
-    await api.git.pushTag({cwd, tag, gitCommitterName, gitCommitterEmail})
+    await ensureSha(cwd, sha)
+    await api.git.pushTag({cwd, tag, sha, gitCommitterName, gitCommitterEmail})
     return 'ok'
   } catch (e) {
     if (isTagConflict(e)) return 'conflict'

package/src/main/js/post/courier/index.js

@@ -49,13 +49,14 @@ export const resolveManifest = (manifest, env = process.env) => {
 
 const MARKERS = new Set(['released', 'skip', 'conflict', 'orphan'])
 
-const openParcel = async (tarPath, env) => {
+const openParcel = async (tarPath, env, {cwd} = {}) => {
   const content = await fs.readFile(tarPath, 'utf8').catch(() => null)
   if (MARKERS.has(content)) return null
 
   const destDir = tempy.temporaryDirectory()
   const {manifest} = await unpackTar(tarPath, destDir)
   const resolved = resolveManifest(manifest, env)
+  if (cwd) resolved.cwd = cwd
   const ch = channels[resolved.channel]
 
   if (!ch) return {warn: `unknown channel '${resolved.channel || '<none>'}'`}
@@ -67,14 +68,14 @@ const openParcel = async (tarPath, env) => {
   return {ch, resolved, destDir, tarPath}
 }
 
-export const inspect = async (tars, env = process.env) => {
+export const inspect = async (tars, env = process.env, {cwd} = {}) => {
   const parcels = []
   const skipped = []
 
   for (const tarPath of tars) {
     const fname = path.basename(tarPath)
     try {
-      const p = await openParcel(tarPath, env)
+      const p = await openParcel(tarPath, env, {cwd})
       if (!p) continue
       if (p.warn) {
         skipped.push({file: fname, reason: p.warn, tarPath: p.tarPath})
@@ -100,8 +101,8 @@ export const inspect = async (tars, env = process.env) => {
 
 // --- Legacy deliver (no directive) ---
 
-const deliverLegacy = async (tars, env, {concurrency, dryRun}) => {
-  const {groups, skipped, total, pending} = await inspect(tars, env)
+const deliverLegacy = async (tars, env, {concurrency, dryRun, cwd}) => {
+  const {groups, skipped, total, pending} = await inspect(tars, env, {cwd})
 
   for (const {file, reason, tarPath} of skipped) {
     log.warn(`skipping ${file}: ${reason}`)
@@ -135,8 +136,8 @@ const deliverLegacy = async (tars, env, {concurrency, dryRun}) => {
 
 // --- Directive-aware deliver ---
 
-const deliverParcel = async (tarPath, channelName, pkgName, version, env, {dryRun}) => {
-  const p = await openParcel(tarPath, env)
+const deliverParcel = async (tarPath, channelName, pkgName, version, env, {dryRun, cwd}) => {
+  const p = await openParcel(tarPath, env, {cwd})
   if (!p) return 'already'
   if (p.warn) {
     log.warn(`skipping ${p.warn}`)
@@ -159,7 +160,7 @@ const deliverParcel = async (tarPath, channelName, pkgName, version, env, {dryRu
   return res === 'duplicate' ? 'duplicate' : 'ok'
 }
 
-const deliverDirective = async (directive, tarMap, env, {dryRun}) => {
+const deliverDirective = async (directive, tarMap, env, {dryRun, cwd}) => {
   const entries = []
   const conflicts = []
   const skipped = []
@@ -178,7 +179,7 @@ const deliverDirective = async (directive, tarMap, env, {dryRun}) => {
         const tarPath = parcelName && tarMap.get(parcelName)
         if (!tarPath) return 'missing'
 
-        return deliverParcel(tarPath, channelName, pkgName, pkg.version, env, {dryRun})
+        return deliverParcel(tarPath, channelName, pkgName, pkg.version, env, {dryRun, cwd})
       }))
 
       for (let i = 0; i < step.length; i++) {
@@ -209,7 +210,7 @@ export const deliver = async (tars, env = process.env, {concurrency = 4, dryRun
   const dir = tars.length ? path.dirname(tars[0]) : null
   const directives = dir ? await scanDirectives(dir) : []
 
-  if (!directives.length) return deliverLegacy(tars, env, {concurrency, dryRun})
+  if (!directives.length) return deliverLegacy(tars, env, {concurrency, dryRun, cwd})
 
   const tarMap = new Map(tars.map(t => [path.basename(t), t]))
   const allEntries = []
@@ -225,7 +226,7 @@ export const deliver = async (tars, env = process.env, {concurrency = 4, dryRun
 
     try {
       await invalidateOrphans(dir, directive)
-      const {entries, conflicts, skipped} = await deliverDirective(directive, tarMap, env, {dryRun})
+      const {entries, conflicts, skipped} = await deliverDirective(directive, tarMap, env, {dryRun, cwd: gitRoot})
       allEntries.push(...entries)
       allConflicts.push(...conflicts)
       allSkipped.push(...skipped)

package/src/main/js/post/courier/semaphore.js

@@ -1,8 +1,17 @@
+import {$} from 'zx-extra'
 import {api} from '../api/index.js'
+import {DEFAULT_GIT_COMMITTER_NAME, DEFAULT_GIT_COMMITTER_EMAIL} from '../api/git.js'
 
 const tagName = ({sha}) =>
   `zbr-deliver.${sha.slice(0, 7)}`
 
+const ensureHead = async (cwd) => {
+  try { await $({cwd, quiet: true})`git rev-parse HEAD` } catch {
+    await api.git.setUserConfig(cwd, DEFAULT_GIT_COMMITTER_NAME, DEFAULT_GIT_COMMITTER_EMAIL)
+    await $({cwd, quiet: true})`git commit --allow-empty -m init`
+  }
+}
+
 export const tryLock = async (cwd, directive) => {
   const tag = tagName(directive)
   const body = JSON.stringify({
@@ -11,6 +20,7 @@ export const tryLock = async (cwd, directive) => {
     packages: directive.queue,
   })
   try {
+    await ensureHead(cwd)
     await api.git.pushAnnotatedTag(cwd, tag, body)
     return true
   } catch {

package/src/main/js/post/depot/steps/pack.js

@@ -3,6 +3,7 @@ import {memoizeBy, asTuple} from '../../../util.js'
 import {api} from '../../api/index.js'
 import {prepare, getActiveChannels} from '../../courier/index.js'
 import {buildParcels, PARCELS_DIR} from '../../parcel/index.js'
+import {sanitizePkgName} from '../../parcel/build.js'
 import {formatReleaseNotes} from '../generators/notes.js'
 import {packTar, hashFile} from '../../tar.js'
 
@@ -43,7 +44,8 @@ export const pack = memoizeBy(async (pkg, ctx = pkg.ctx) => {
     await packTar(tmpPath, manifest, files)
     const hash = await hashFile(tmpPath)
     const sha7 = ctx.git.sha.slice(0, 7)
-    const finalPath = path.join(stageDir, `parcel.${sha7}.${channel}.${pkg.tag}.${hash}.tar`)
+    const safeName = sanitizePkgName(pkg.name)
+    const finalPath = path.join(stageDir, `parcel.${sha7}.${channel}.${safeName}.${pkg.version}.${hash}.tar`)
     await fs.move(tmpPath, finalPath)
     tars.push(finalPath)
   }

package/src/main/js/post/modes/deliver.js

@@ -1,4 +1,4 @@
-import {$, glob, path} from 'zx-extra'
+import {$, glob, path, tempy} from 'zx-extra'
 import {createReport, log} from '../log.js'
 import {deliver} from '../courier/index.js'
 import {PARCELS_DIR} from '../parcel/index.js'
@@ -15,9 +15,33 @@ export const runDeliver = async ({env, flags}) => {
   const tars = await glob(path.join(dir, 'parcel.*.tar'))
   if (!tars.length) return report.setStatus('success').log(`no parcels in ${dir}`)
 
+  const cwd = await ensureGitRepo(env)
+
   report.setStatus('delivering').log(`parcels: ${tars.length}`)
-  const result = await deliver(tars, env, {dryRun: flags.dryRun})
+  const result = await deliver(tars, env, {dryRun: flags.dryRun, cwd})
   report.set('delivery', result).setStatus('success')
 
   log.info(`done: ${result.delivered} delivered, ${result.skipped} skipped`)
 }
+
+const ensureGitRepo = async (env) => {
+  try {
+    return (await $({quiet: true})`git rev-parse --show-toplevel`).toString().trim()
+  } catch {
+    // Deliver runs in a clean runner with no checkout — init a temp repo for git push operations.
+    const tmp = tempy.temporaryDirectory()
+    const repo = env.GITHUB_REPOSITORY || ''
+    const token = env.GH_TOKEN || env.GITHUB_TOKEN || ''
+    const user = env.GH_USER || env.GH_USERNAME || 'x-access-token'
+    const server = env.GITHUB_SERVER_URL || 'https://github.com'
+    const host = new URL(server).host
+    const origin = token
+      ? `https://${user}:${token}@${host}/${repo}.git`
+      : `${server}/${repo}.git`
+
+    await $({quiet: true})`git init ${tmp}`
+    await $({quiet: true, cwd: tmp})`git remote add origin ${origin}`
+    log.info(`initialized temp git repo for delivery: ${repo}`)
+    return tmp
+  }
+}

package/src/main/js/post/parcel/build.js

@@ -1,5 +1,7 @@
 import {asTuple, msgJoin} from '../../util.js'
 
+export const sanitizePkgName = (name) => name.replace(/[^a-z0-9-]/ig, '-').replace(/^-+|-+$/g, '')
+
 const gitFields = (a, pkg) => ({
   repoHost: a.repoHost,
   repoName: a.repoName,
@@ -14,7 +16,7 @@ const entry = {
     manifest: {
       channel: 'git-tag',
       name: pkg.name, version: pkg.version, tag: pkg.tag,
-      cwd: ctx.git.root,
+      cwd: ctx.git.root, sha: ctx.git.sha,
       gitCommitterName: '${{GIT_COMMITTER_NAME}}',
       gitCommitterEmail: '${{GIT_COMMITTER_EMAIL}}',
     },

package/src/main/js/post/parcel/index.js

@@ -1,4 +1,4 @@
-export {buildParcels} from './build.js'
+export {buildParcels, sanitizePkgName} from './build.js'
 export {buildDirective, parseDirective, scanDirectives, invalidateOrphans, parcelChannel} from './directive.js'
 export {verifyParcels} from './verify.js'
 export const PARCELS_DIR = 'parcels'

package/src/main/js/post/parcel/verify.js

@@ -1,5 +1,6 @@
 import {path} from 'zx-extra'
 import {parcelChannel} from './directive.js'
+import {sanitizePkgName} from './build.js'
 
 export const verifyParcels = (tars, context) => {
   const {sha7, packages: expected} = context
@@ -25,8 +26,8 @@ export const verifyParcels = (tars, context) => {
       continue
     }
 
-    const belongsTo = Object.entries(expected).find(([, pkg]) =>
-      pkg.tag && name.includes(`.${pkg.tag}.`)
+    const belongsTo = Object.entries(expected).find(([pkgName, pkg]) =>
+      name.includes(`.${sanitizePkgName(pkgName)}.${pkg.version}.`)
     )
     if (!belongsTo) {
       errors.push(`unexpected parcel (no matching package): ${name}`)