Merge branch 'main' into add-assume-yes-git-node-release

Author: aduh95

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [5.5.1](https://github.com/nodejs/node-core-utils/compare/v5.5.0...v5.5.1) (2024-09-26)
+
+
+### Bug Fixes
+
+* **git-node:** ignore all non-gha nodes when checking for GitHub CI ([#857](https://github.com/nodejs/node-core-utils/issues/857)) ([342ff5b](https://github.com/nodejs/node-core-utils/commit/342ff5baddbccd12d605547e718cec7508a50280))
+* **ncu-ci:** fix cache and stats option, and use tmpdir for cache ([#849](https://github.com/nodejs/node-core-utils/issues/849)) ([aa25318](https://github.com/nodejs/node-core-utils/commit/aa25318cd46e3698f59da59bf8e1ed6809da5ada))
+* **v8:** handle error in git apply ([#851](https://github.com/nodejs/node-core-utils/issues/851)) ([11d0a04](https://github.com/nodejs/node-core-utils/commit/11d0a04aa08a221b400515801a99702c339fd832))
+
 ## [5.5.0](https://github.com/nodejs/node-core-utils/compare/v5.4.0...v5.5.0) (2024-09-01)
 
 

components/git/release.js

@@ -17,6 +17,10 @@ const releaseOptions = {
     describe: 'Promote new release of Node.js',
     type: 'boolean'
   },
+  releaseDate: {
+    describe: 'Default relase date when --prepare is used. It must be YYYY-MM-DD',
+    type: 'string'
+  },
   security: {
     describe: 'Demarcate the new security release as a security release',
     type: 'boolean'
@@ -37,7 +41,7 @@ const releaseOptions = {
     type: 'boolean',
     default: false,
     describe: 'Assume "yes" as answer to all prompts and run ' +
-    'non-interactively.'
+    'non-interactively.',
   }
 };
 

components/git/v8.js

@@ -22,6 +22,7 @@ export function builder(yargs) {
           default: 'lkgr'
         });
         yargs.option('version-bump', {
+          type: 'boolean',
           describe: 'Bump the NODE_MODULE_VERSION constant',
           default: true
         });
@@ -39,10 +40,12 @@ export function builder(yargs) {
       builder: (yargs) => {
         yargs
           .option('bump', {
+            type: 'boolean',
             describe: 'Bump V8 embedder version number or patch version',
             default: true
           })
           .option('squash', {
+            type: 'boolean',
             describe:
                 'If multiple commits are backported, squash them into one',
             default: false
@@ -62,8 +65,8 @@ export function builder(yargs) {
       describe: 'Directory of an existing V8 clone'
     })
     .option('verbose', {
+      type: 'boolean',
       describe: 'Enable verbose output',
-      boolean: true,
       default: false
     });
 }

docs/git-node.md

@@ -223,9 +223,11 @@ Options:
   --prepare   Prepare a new release of Node.js                         [boolean]
   --security  Demarcate the new security release as a security release [boolean]
   --startLTS  Mark the release as the transition from Current to LTS   [boolean]
-  --filterLabel Filter PR by label when preparing a security release   [string]
   --yes       Skip all prompts and run
               non-interactively. [boolean] [default: false]
+  --filterLabel Filter PR by label when preparing a security release   [string]
+  --releaseDate Default relase date when --prepare is used.
+                It must be YYYY-MM-DD   [string]
 ```
 
 ### Example

lib/pr_checker.js

@@ -29,7 +29,6 @@ const GITHUB_SUCCESS_CONCLUSIONS = ['SUCCESS', 'NEUTRAL', 'SKIPPED'];
 const FAST_TRACK_RE = /^Fast-track has been requested by @(.+?)\. Please 👍 to approve\.$/;
 const FAST_TRACK_MIN_APPROVALS = 2;
 const GIT_CONFIG_GUIDE_URL = 'https://github.com/nodejs/node/blob/99b1ada/doc/guides/contributing/pull-requests.md#step-1-fork';
-const IGNORED_CHECK_SLUGS = ['dependabot', 'codecov'];
 
 // eslint-disable-next-line no-extend-native
 Array.prototype.findLastIndex ??= function findLastIndex(fn) {
@@ -374,9 +373,10 @@ export default class PRChecker {
 
     // GitHub new Check API
     for (const { status, conclusion, app } of checkSuites.nodes) {
-      if (app && IGNORED_CHECK_SLUGS.includes(app.slug)) {
-        // Ignore Dependabot and Codecov check suites.
-        // They are expected to show up sometimes and never complete.
+      if (app.slug !== 'github-actions') {
+        // Ignore all non-github check suites, such as Dependabot and Codecov.
+        // They are expected to show up on PRs whose head branch is not on a
+        // fork and never complete.
         continue;
       }
 

lib/prepare_release.js

@@ -25,6 +25,7 @@ export default class ReleasePreparation extends Session {
     this.isLTS = false;
     this.isLTSTransition = argv.startLTS;
     this.runBranchDiff = !argv.skipBranchDiff;
+    this.defaultReleaseDate = argv.releaseDate ?? new Date().toISOString().slice(0, 10);
     this.ltsCodename = '';
     this.date = '';
     this.filterLabels = argv.filterLabel && argv.filterLabel.split(',');
@@ -241,9 +242,8 @@ export default class ReleasePreparation extends Session {
     cli.stopSpinner('Updated REPLACEME items in docs');
 
     // Fetch date to use in release commit & changelogs.
-    const todayDate = new Date().toISOString().split('T')[0];
     this.date = await cli.prompt('Enter release date in YYYY-MM-DD format:',
-      { questionType: 'input', defaultAnswer: todayDate });
+      { questionType: 'input', defaultAnswer: this.defaultReleaseDate });
 
     cli.startSpinner('Updating CHANGELOG.md');
     await this.updateMainChangelog();
@@ -253,9 +253,6 @@ export default class ReleasePreparation extends Session {
     await this.updateMajorChangelog();
     cli.stopSpinner(`Updated CHANGELOG_V${versionComponents.major}.md`);
 
-    await cli.prompt('Finished editing the changelogs?',
-      { defaultAnswer: false });
-
     // Create release commit.
     const shouldCreateReleaseCommit = await cli.prompt(
       'Create release commit?');
@@ -272,9 +269,7 @@ export default class ReleasePreparation extends Session {
       cli.warn(`Please manually edit commit ${lastCommitSha} by running ` +
       '`git commit --amend` before proceeding.');
 
-      await cli.prompt(
-        'Finished editing the release commit?',
-        { defaultAnswer: false });
+      await cli.prompt('Finished editing the release commit?');
     }
 
     cli.separator();
@@ -625,8 +620,7 @@ export default class ReleasePreparation extends Session {
     ]);
 
     cli.log(`${messageTitle}\n\n${messageBody.join('')}`);
-    const useMessage = await cli.prompt(
-      'Continue with this commit message?', { defaultAnswer: false });
+    const useMessage = await cli.prompt('Continue with this commit message?');
     return useMessage;
   }
 

lib/request.js

@@ -158,7 +158,13 @@ export default class Request {
         Accept: 'application/json'
       }
     };
-    return this.json(url, options);
+    const data = await this.json(url, options);
+    if (data?.errors) {
+      throw new Error(
+        `Request to fetch triaged reports failed with: ${JSON.stringify(data.errors)}`
+      );
+    }
+    return data;
   }
 
   async getPrograms() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@node-core/utils",
-  "version": "5.5.0",
+  "version": "5.5.1",
   "description": "Utilities for Node.js core collaborators",
   "type": "module",
   "engines": {

test/fixtures/github-ci/both-apis-failure.json

@@ -13,6 +13,7 @@
       "checkSuites": {
         "nodes": [
           {
+            "app": { "slug": "github-actions" },
             "status": "COMPLETED",
             "conclusion": "FAILURE"
           }

test/fixtures/github-ci/both-apis-success.json

@@ -13,6 +13,7 @@
       "checkSuites": {
         "nodes": [
           {
+            "app": { "slug": "github-actions" },
             "status": "COMPLETED",
             "conclusion": "SUCCESS"
           }