zx-bulk-release 2.2.1 → 2.2.3

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [2.2.3](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.2...v2.2.3) (2023-03-24)
+
+### Fixes & improvements
+* fix: debug ([c1699e6](https://github.com/semrel-extra/zx-bulk-release/commit/c1699e6c7d8bbc180c4ef17dfdb9f25816814578))
+
+## [2.2.2](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.1...v2.2.2) (2023-03-24)
+
+### Fixes & improvements
+* fix: fix gitPush retry ([268da72](https://github.com/semrel-extra/zx-bulk-release/commit/268da727036b0d3bf20b1ef10053440c5f56dad0))
+
 ## [2.2.1](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.0...v2.2.1) (2023-03-23)
 
 ### Fixes & improvements

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zx-bulk-release",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "zx-based alternative for multi-semantic-release",
   "type": "module",
   "exports": {

package/src/main/js/config.js

@@ -34,6 +34,8 @@ export const normalizePkgConfig = (config, env) => ({
   npmFetch: config.npmFetch || config.fetch || config.fetchPkg,
   buildCmd: config.buildCmd || config.cmd,
   get ghBasicAuth() {
+    console.log('this.ghToken', !!this.ghToken)
+    console.log('this.ghUser', !!this.ghUser)
     return this.ghUser && this.ghToken ? `${this.ghUser}:${this.ghToken}` : false
   }
 })

package/src/main/js/git.js

@@ -53,8 +53,12 @@ export const pushCommit = async ({cwd, from, to, branch, origin, msg, ignoreFile
       return await $.raw`git push origin HEAD:refs/heads/${branch}`
     } catch (e) {
       retries -= 1
+      log({level: 'error'})('git push failed', 'branch', branch, 'retries left', retries, e)
       branches[keyByValue(branches, _cwd)] = null
-      log({level: 'warn'})('git push failed', 'retries left', retries, e)
+
+      if (retries === 0) {
+        throw e
+      }
     }
   }
 })
@@ -64,6 +68,7 @@ export const getRepo = async (_cwd, {basicAuth} = {}) => {
   const cwd = await getRoot(_cwd)
   if (repos[cwd]) return repos[cwd]
 
+  console.log('!!! has basic auth', !!basicAuth)
   const originUrl = await getOrigin(cwd)
   const [, , repoHost, repoName] = originUrl.replace(':', '/').replace(/\.git/, '').match(/.+(@|\/\/)([^/]+)\/(.+)$/) || []
   const repoPublicUrl = `https://${repoHost}/${repoName}`

package/src/main/js/log.js

@@ -53,7 +53,7 @@ export const createReport = ({logger = console, file = null} = {}) => ({
   },
   log(ctx = {}) {
     return function (...chunks) {
-      const {pkg, scope = pkg?.name || '~', level = 'info'} = ctx
+      const {pkg, scope = pkg?.name || $.scope || '~', level = 'info'} = ctx
       const msg = chunks.map(c => typeof c === 'string' ? tpl(c, ctx) : c)
       const event = {msg, scope, date: Date.now(), level}
       this.events.push(event)

package/src/main/js/processor.js

@@ -114,7 +114,8 @@ const contextify = async (pkg, packages, root) => {
   }
 }
 
-const build = async (pkg, packages, run = runCmd, self = build) => {
+const build = async (pkg, packages, run = runCmd, self = build) => within(async () => {
+  $.scope = pkg.name
   if (pkg.built) return
 
   await Promise.all([
@@ -130,9 +131,10 @@ const build = async (pkg, packages, run = runCmd, self = build) => {
   }
 
   pkg.built = true
-}
+})
 
-const publish = async (pkg, run = runCmd) => {
+const publish = async (pkg, run = runCmd) => within(async () => {
+  $.scope = pkg.name
   await fs.writeJson(pkg.manifestPath, pkg.manifest, {spaces: 2})
   await pushTag(pkg)
 
@@ -144,4 +146,4 @@ const publish = async (pkg, run = runCmd) => {
     ghPages(pkg),
     run(pkg, 'publishCmd')
   ])
-}
+})