@node-core/utils 4.0.0 → 4.1.0

package/bin/ncu-ci.js

@@ -215,6 +215,11 @@ const args = yargs(hideBin(process.argv))
     default: false,
     type: 'boolean'
   })
+  .option('skip-more-than', {
+    describe: 'Skip jobs that fail more than <limit> builds, when --stat is true, default to 10.',
+    type: 'number',
+    default: Infinity
+  })
   .option('nobuild', {
     describe: 'If running cigtm, whether or not jobid is citgm-nobuild.',
     type: 'boolean',
@@ -325,15 +330,19 @@ class CICommand {
       cli.separator('');
 
       let build;
+      let { skipMoreThan } = argv;
+      if (argv.stats && argv.skipMoreThan === Infinity) {
+        skipMoreThan = 10;
+      }
       switch (job.type) {
         case 'health':
           build = new HealthBuild(cli, request, job.ciType, job.builds);
           break;
         case PR:
-          build = new PRBuild(cli, request, job.jobid);
+          build = new PRBuild(cli, request, job.jobid, skipMoreThan);
           break;
         case COMMIT:
-          build = new CommitBuild(cli, request, job.jobid);
+          build = new CommitBuild(cli, request, job.jobid, skipMoreThan);
           break;
         case CITGM:
         case CITGM_NOBUILD:

package/lib/ci/build-types/commit_build.js

@@ -20,10 +20,11 @@ const {
 } = CIFailureParser;
 
 export class CommitBuild extends TestBuild {
-  constructor(cli, request, id) {
+  constructor(cli, request, id, skipMoreThan) {
     const path = `job/node-test-commit/${id}/`;
     const tree = COMMIT_TREE;
     super(cli, request, path, tree);
+    this.skipMoreThan = skipMoreThan;
   }
 
   getBuilds({ result, subBuilds }) {
@@ -89,6 +90,11 @@ export class CommitBuild extends TestBuild {
       return { result, builds, failures };
     }
 
+    if (builds.failed.length > this.skipMoreThan) {
+      cli.log(`Failed ${builds.failed.length} builds (> ${this.skipMoreThan}), skipping`);
+      return { result, builds, failures: [] };
+    }
+
     cli.startSpinner(`Querying failures of ${path}`);
     const promises = builds.failed.map(({ jobName, buildNumber, url }) => {
       if (jobName.includes('fanned')) {

package/lib/ci/build-types/pr_build.js

@@ -15,11 +15,11 @@ const {
 } = CIFailureParser;
 
 export class PRBuild extends TestBuild {
-  constructor(cli, request, id) {
+  constructor(cli, request, id, skipMoreThan) {
     const path = `job/node-test-pull-request/${id}/`;
     const tree = PR_TREE;
     super(cli, request, path, tree);
-
+    this.skipMoreThan = skipMoreThan;
     this.commitBuild = null;
   }
 
@@ -78,7 +78,7 @@ export class PRBuild extends TestBuild {
       result, subBuilds: allBuilds, changeSet, actions, timestamp
     };
     const commitBuildId = commitBuild.buildNumber;
-    this.commitBuild = new CommitBuild(cli, request, commitBuildId);
+    this.commitBuild = new CommitBuild(cli, request, commitBuildId, this.skipMoreThan);
     const { builds, failures } = await this.commitBuild.getResults(buildData);
 
     // Set up aliases for display

package/lib/ci/failure_aggregator.js

@@ -43,7 +43,9 @@ export class FailureAggregator {
         .sortBy((f) => parseJobFromURL(f.upstream).jobid)
         .map((item) => ({ source: item.source, upstream: item.upstream }))
         .value();
-      const machines = _.uniq(failures.map(f => f.builtOn));
+      const machines = _.uniqBy(
+        failures.map(f => ({ hostname: f.builtOn, url: f.url })),
+        'hostname');
       data.push({
         reason, type: failures[0].type, failures, prs, machines
       });
@@ -91,7 +93,7 @@ export class FailureAggregator {
         output += markdownRow('Reason', `<code>${reason}</code>`);
         output += markdownRow('-', ':-');
         output += markdownRow('Type', type);
-        const source = prs.map(f => f.source);
+        const source = prs.map(f => `[${f.source}](${f.upstream})`);
         output += markdownRow(
           'Failed PR', `${source.length} (${source.join(', ')})`
         );
@@ -137,7 +139,7 @@ export class FailureAggregator {
             return parsed ? `#${parsed.prid}` : f.source;
           });
         cli.table('Failed PR', `${source.length} (${source.join(', ')})`);
-        cli.table('Appeared', machines.join(', '));
+        cli.table('Appeared', machines.map(m => m.hostname).join(', '));
         if (prs.length > 1) {
           cli.table('First CI', `${prs[0].upstream}`);
         }

package/lib/github/templates/next-security-release.md

@@ -62,7 +62,7 @@
 
 * [ ] [Unlock CI](https://github.com/nodejs/build/blob/HEAD/doc/jenkins-guide.md#after-the-release)
 
-* [ ] Post-release announcement to Nodejs.org blog: https://github.com/nodejs/nodejs.org/pull/5447
+* [ ] Post-release announcement to Nodejs.org blog:
   * (Re-PR the pre-approved branch from nodejs-private/nodejs.org-private to
     nodejs/nodejs.org)
 

package/lib/links.js

@@ -106,8 +106,8 @@ export function getPrURL({ owner, repo, prid }) {
   return `https://github.com/${owner}/${repo}/pull/${prid}`;
 };
 
-export function getMachineUrl(name) {
-  return `[${name}](https://ci.nodejs.org/computer/${name}/)`;
+export function getMachineUrl(machine) {
+  return `[${machine.hostname}](${machine.url})`;
 };
 
 const PR_URL_RE = /PR-URL: https:\/\/github.com\/.+/;

package/lib/update-v8/applyNodeChanges.js

@@ -1,6 +1,5 @@
 import path from 'node:path';
 
-import Enquirer from 'enquirer';
 import { Listr } from 'listr2';
 
 import {
@@ -23,11 +22,7 @@ export default function applyNodeChanges() {
     task: async(ctx) => {
       const v8Version = await getNodeV8Version(ctx.nodeDir);
       const list = filterForVersion(nodeChanges, v8Version);
-      return new Listr(list.map((change) => change.task()), {
-        injectWrapper: {
-          enquirer: new Enquirer()
-        }
-      });
+      return new Listr(list.map((change) => change.task()));
     }
   };
 }

package/lib/update-v8/backport.js

@@ -3,9 +3,9 @@ import {
   promises as fs
 } from 'node:fs';
 
-import Enquirer from 'enquirer';
 import inquirer from 'inquirer';
 import { Listr } from 'listr2';
+import { ListrEnquirerPromptAdapter } from '@listr2/prompt-adapter-enquirer';
 
 import { shortSha } from '../utils.js';
 
@@ -51,11 +51,7 @@ export function doBackport(options) {
   return {
     title: 'V8 commit backport',
     task: () => {
-      return new Listr(todo, {
-        injectWrapper: {
-          enquirer: new Enquirer()
-        }
-      });
+      return new Listr(todo);
     }
   };
 };
@@ -169,11 +165,7 @@ function applyAndCommitPatches() {
   return {
     title: 'Apply and commit patches to deps/v8',
     task: (ctx) => {
-      return new Listr(ctx.patches.map(applyPatchTask), {
-        injectWrapper: {
-          enquirer: new Enquirer()
-        }
-      });
+      return new Listr(ctx.patches.map(applyPatchTask));
     }
   };
 }
@@ -196,11 +188,7 @@ function applyPatchTask(patch) {
         }
       }
       todo.push(commitPatch(patch));
-      return new Listr(todo, {
-        injectWrapper: {
-          enquirer: new Enquirer()
-        }
-      });
+      return new Listr(todo);
     }
   };
 }
@@ -214,7 +202,7 @@ async function applyPatch(ctx, task, patch) {
     );
   } catch (e) {
     patch.hadConflicts = true;
-    return task.prompt({
+    return task.prompt(ListrEnquirerPromptAdapter).run({
       type: 'input',
       message: "Resolve merge conflicts and enter 'RESOLVED'",
       validate: value => value.toUpperCase() === 'RESOLVED'

package/lib/update-v8/index.js

@@ -1,4 +1,3 @@
-import Enquirer from 'enquirer';
 import { Listr } from 'listr2';
 
 import { checkOptions, doBackport } from './backport.js';
@@ -48,9 +47,6 @@ export async function backport(options) {
  */
 function getOptions(opts) {
   return {
-    renderer: opts.verbose ? 'verbose' : 'default',
-    injectWrapper: {
-      enquirer: new Enquirer()
-    }
+    renderer: opts.verbose ? 'verbose' : 'default'
   };
 }

package/lib/update-v8/majorUpdate.js

@@ -1,7 +1,6 @@
 import path from 'node:path';
 import { promises as fs } from 'node:fs';
 
-import Enquirer from 'enquirer';
 import { Listr } from 'listr2';
 
 import { getCurrentV8Version } from './common.js';
@@ -30,11 +29,7 @@ export default function majorUpdate() {
         addDepsV8(),
         updateV8Deps(),
         applyNodeChanges()
-      ], {
-        injectWrapper: {
-          enquirer: new Enquirer()
-        }
-      });
+      ]);
     }
   };
 };

package/lib/update-v8/minorUpdate.js

@@ -2,7 +2,6 @@ import { spawn } from 'node:child_process';
 import path from 'node:path';
 import { promises as fs } from 'node:fs';
 
-import Enquirer from 'enquirer';
 import { Listr } from 'listr2';
 
 import { getCurrentV8Version } from './common.js';
@@ -17,11 +16,7 @@ export default function minorUpdate() {
         getCurrentV8Version(),
         getLatestV8Version(),
         doMinorUpdate()
-      ], {
-        injectWrapper: {
-          enquirer: new Enquirer()
-        }
-      });
+      ]);
     }
   };
 };

package/lib/update-v8/updateV8Clone.js

@@ -1,6 +1,5 @@
 import { promises as fs } from 'node:fs';
 
-import Enquirer from 'enquirer';
 import { Listr } from 'listr2';
 
 import { v8Git } from './constants.js';
@@ -10,11 +9,7 @@ export default function updateV8Clone() {
   return {
     title: 'Update local V8 clone',
     task: () => {
-      return new Listr([fetchOrigin(), createClone()], {
-        injectWrapper: {
-          enquirer: new Enquirer()
-        }
-      });
+      return new Listr([fetchOrigin(), createClone()]);
     }
   };
 };

package/lib/update-v8/updateVersionNumbers.js

@@ -1,7 +1,6 @@
 import path from 'node:path';
 import { promises as fs } from 'node:fs';
 
-import Enquirer from 'enquirer';
 import { Listr } from 'listr2';
 
 import { getNodeV8Version } from './util.js';
@@ -10,11 +9,7 @@ export default function updateVersionNumbers() {
   return {
     title: 'Update version numbers',
     task: () => {
-      return new Listr([resetEmbedderString(), bumpNodeModule()], {
-        injectWrapper: {
-          enquirer: new Enquirer()
-        }
-      });
+      return new Listr([resetEmbedderString(), bumpNodeModule()]);
     }
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@node-core/utils",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Utilities for Node.js core collaborators",
   "type": "module",
   "engines": {
@@ -34,36 +34,36 @@
   ],
   "license": "MIT",
   "dependencies": {
+    "@listr2/prompt-adapter-enquirer": "^1.0.1",
     "@node-core/caritat": "^1.2.0",
+    "@pkgjs/nv": "^0.2.1",
     "branch-diff": "^2.1.4",
     "chalk": "^5.3.0",
     "changelog-maker": "^3.2.4",
-    "@pkgjs/nv": "^0.2.1",
     "cheerio": "^1.0.0-rc.12",
     "clipboardy": "^3.0.0",
     "core-validate-commit": "^4.0.0",
-    "enquirer": "^2.4.1",
     "figures": "^5.0.0",
     "ghauth": "^5.0.1",
-    "inquirer": "^9.2.10",
+    "inquirer": "^9.2.11",
     "js-yaml": "^4.1.0",
-    "listr2": "^6.6.1",
+    "listr2": "^7.0.1",
     "lodash": "^4.17.21",
     "log-symbols": "^5.1.0",
     "ora": "^7.0.1",
     "replace-in-file": "^7.0.1",
-    "undici": "^5.23.0",
-    "which": "^3.0.1",
+    "undici": "^5.25.2",
+    "which": "^4.0.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
     "@reporters/github": "^1.5.2",
     "c8": "^8.0.1",
-    "eslint": "^8.47.0",
+    "eslint": "^8.50.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-n": "^16.0.2",
+    "eslint-plugin-n": "^16.1.0",
     "eslint-plugin-promise": "^6.1.1",
-    "sinon": "^15.2.0"
+    "sinon": "^16.0.0"
   }
 }