bulk-release 2.2.13 → 2.2.15

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [2.2.15](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.14...v2.2.15) (2023-03-28)
+
+### Fixes & improvements
+* fix: apply queuefy to changelog push ([b8b353d](https://github.com/semrel-extra/zx-bulk-release/commit/b8b353d439916ac57f717a3d463c710702b00d4d))
+
+## [2.2.14](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.13...v2.2.14) (2023-03-28)
+
+### Fixes & improvements
+* fix: apply memoize to git config ops ([b46bec0](https://github.com/semrel-extra/zx-bulk-release/commit/b46bec030e711f840f143392c64f6330e6588f8d))
+
 ## [2.2.13](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.12...v2.2.13) (2023-03-27)
 
 ### Fixes & improvements

package/package.json

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

package/src/main/js/changelog.js

@@ -1,10 +1,11 @@
 import {$} from 'zx-extra'
-import {log} from './log.js'
+import {queuefy} from 'queuefy'
 import {fetchRepo, getRepo, pushCommit} from './git.js'
-import {msgJoin} from './util.js'
+import {log} from './log.js'
 import {formatTag} from './meta.js'
+import {msgJoin} from './util.js'
 
-export const pushChangelog = async (pkg) => {
+export const pushChangelog = queuefy(async (pkg) => {
   const {absPath: cwd, config: {changelog: opts, gitCommitterEmail, gitCommitterName, ghBasicAuth: basicAuth}} = pkg
   if (!opts) return
 
@@ -18,7 +19,7 @@ export const pushChangelog = async (pkg) => {
 
   await $.o({cwd: _cwd})`echo ${releaseNotes}"\n$(cat ./${file})" > ./${file}`
   await pushCommit({cwd, branch, msg, gitCommitterEmail, gitCommitterName, basicAuth})
-}
+})
 
 export const formatReleaseNotes = async (pkg) => {
   const {name, version, absPath: cwd, config: {ghBasicAuth: basicAuth}} = pkg

package/src/main/js/git.js

@@ -30,9 +30,8 @@ export const pushCommit = async ({cwd, from, to, branch, origin, msg, ignoreFile
   if (from) await copy({baseFrom: cwd, from, baseTo: _cwd, to, ignoreFiles, cwd})
 
   try {
-    await $`git config user.name ${gitCommitterName} &&
-            git config user.email ${gitCommitterEmail} &&
-            git add . &&
+    await setUserConfig(_cwd, gitCommitterName, gitCommitterEmail)
+    await $`git add . &&
             git commit -m ${msg}`
   } catch {
     log({level: 'warn'})(`no changes to commit to ${branch}`)
@@ -99,3 +98,21 @@ export const getTags = async (cwd, ref = '') =>
   (await $.o({cwd})`git tag -l ${ref}`)
     .toString()
     .split('\n')
+
+export const pushTag = async ({cwd, tag, gitCommitterName, gitCommitterEmail}) => {
+  await setUserConfig(cwd, gitCommitterName, gitCommitterEmail)
+  await $.o({cwd})`
+    git tag -m ${tag} ${tag} &&
+    git push origin ${tag}`
+}
+
+// Memoize prevents .git/config lock
+// https://github.com/qiwi/packasso/actions/runs/4539987310/jobs/8000403413#step:7:282
+export const setUserConfig = memoizeBy(async(cwd, gitCommitterName, gitCommitterEmail) => $.o({cwd})`
+  git config user.name ${gitCommitterName} &&
+  git config user.email ${gitCommitterEmail}
+`)
+
+export const unsetUserConfig = async(cwd) => $.o({cwd})`
+  git config --unset user.name &&
+  git config --unset user.email`

package/src/main/js/meta.js

@@ -2,24 +2,21 @@
 
 import {Buffer} from 'node:buffer'
 import {queuefy} from 'queuefy'
-import {ctx, semver, $, fs, path} from 'zx-extra'
+import {semver, $, fs, path} from 'zx-extra'
 import {log} from './log.js'
-import {fetchRepo, pushCommit, getTags as getGitTags} from './git.js'
+import {fetchRepo, pushCommit, getTags as getGitTags, pushTag} from './git.js'
 import {fetchManifest} from './npm.js'
 
-export const pushTag = (pkg) => ctx(async ($) => {
-  const {absPath: cwd, name, version, config: {gitCommitterEmail, gitCommitterName}} = pkg
+export const pushReleaseTag = async (pkg) => {
+  const {name, version, config: {gitCommitterEmail, gitCommitterName}} = pkg
   const tag = formatTag({name, version})
+  const cwd = pkg.context.git.root
 
   pkg.context.git.tag = tag
   log({pkg})(`push release tag ${tag}`)
 
-  $.cwd = cwd
-  await $`git config user.name ${gitCommitterName}`
-  await $`git config user.email ${gitCommitterEmail}`
-  await $`git tag -m ${tag} ${tag}`
-  await $`git push origin ${tag}`
-})
+  await pushTag({cwd, tag, gitCommitterEmail, gitCommitterName})
+}
 
 export const pushMeta = queuefy(async (pkg) => {
   log({pkg})('push artifact to branch \'meta\'')

package/src/main/js/processor.js

@@ -6,9 +6,9 @@ import {pushChangelog} from './changelog.js'
 import {getPkgConfig} from './config.js'
 import {topo, traverseDeps, traverseQueue} from './deps.js'
 import {ghPages, ghRelease} from './gh.js'
-import {getRoot, getSha} from './git.js'
+import {getRoot, getSha, unsetUserConfig} from './git.js'
 import {log, createReport} from './log.js'
-import {getLatest, pushMeta, pushTag} from './meta.js'
+import {getLatest, pushMeta, pushReleaseTag} from './meta.js'
 import {fetchPkg, npmPublish} from './npm.js'
 import {memoizeBy, tpl} from './util.js'
 
@@ -62,6 +62,8 @@ export const run = async ({cwd = process.cwd(), env, flags = {}} = {}) => within
       .set('error', e)
       .setStatus('failure')
     throw e
+  } finally {
+    await unsetUserConfig(cwd)
   }
   report
     .setStatus('success')
@@ -140,7 +142,7 @@ const publish = memoizeBy(async (pkg, run = runCmd) => within(async () => {
   }
 
   fs.writeJsonSync(pkg.manifestPath, pkg.manifest, {spaces: 2})
-  await pushTag(pkg)
+  await pushReleaseTag(pkg)
 
   await Promise.all([
     pushMeta(pkg),