Merge branch 'main' into git-node-release-promote

Author: aduh95

.github/workflows/release-please.yml

@@ -5,16 +5,20 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   release-please:
     runs-on: ubuntu-latest
     outputs:
       release_created:  ${{ steps.release.outputs.release_created }}
     steps:
-      - uses: google-github-actions/release-please-action@v4
+      - uses: googleapis/release-please-action@v4
         id: release
         with:
           release-type: node
+          token: ${{ secrets.RELEASE_PLEASE_GITHUB_TOKEN }}
   npm-publish:
     needs: release-please
     if: ${{ needs.release-please.outputs.release_created }}

CHANGELOG.md

@@ -1,5 +1,31 @@
 # 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)
+
+
+### Features
+
+* add git node security --cleanup ([#833](https://github.com/nodejs/node-core-utils/issues/833)) ([871a16f](https://github.com/nodejs/node-core-utils/commit/871a16f7968d112468f751ab019ca575151745d2))
+* add warning when fail on all platforms ([#843](https://github.com/nodejs/node-core-utils/issues/843)) ([4f7ec3e](https://github.com/nodejs/node-core-utils/commit/4f7ec3e7923592dbfef32206bf1c2b21a36e15dd))
+* **git-node:** auto-fetch comparison branch when preparing release ([#846](https://github.com/nodejs/node-core-utils/issues/846)) ([a8529ed](https://github.com/nodejs/node-core-utils/commit/a8529edaab765e293965054b7027774a3f4938f2))
+* **git-node:** auto-fetch latest release tag when preparing release ([#842](https://github.com/nodejs/node-core-utils/issues/842)) ([15ae401](https://github.com/nodejs/node-core-utils/commit/15ae4013b2cbf56ec7f3356d8a8bb682ceef29c3))
+* update next-security-release folder on cleanup ([#840](https://github.com/nodejs/node-core-utils/issues/840)) ([f420432](https://github.com/nodejs/node-core-utils/commit/f420432c6cbdba51da734276d20f73c75728b409))
+* **v8:** add fast_float to V8 deps ([#844](https://github.com/nodejs/node-core-utils/issues/844)) ([4e8ec9c](https://github.com/nodejs/node-core-utils/commit/4e8ec9c072283c8cb31155c66815027ed82fa210))
+
+
+### Bug Fixes
+
+* landing session on different repo/org ([#847](https://github.com/nodejs/node-core-utils/issues/847)) ([7734954](https://github.com/nodejs/node-core-utils/commit/77349540beee5c8d8808f5783e72e106b02f113b))
+
 ## [5.4.0](https://github.com/nodejs/node-core-utils/compare/v5.3.1...v5.4.0) (2024-08-07)
 
 

bin/ncu-ci.js

@@ -77,12 +77,13 @@ const args = yargs(hideBin(process.argv))
         })
         .option('stats', {
           default: false,
+          type: 'boolean',
           describe: 'Aggregate the results'
         })
         .option('cache', {
           default: false,
-          describe: 'Cache the responses from Jenkins in .ncu/cache/ under' +
-                    ' the node-core-utils installation directory'
+          type: 'boolean',
+          describe: 'Cache the responses from Jenkins in $tmpdir/ncu/cache for testing'
         })
         .option('limit', {
           default: 99,
@@ -199,13 +200,14 @@ const args = yargs(hideBin(process.argv))
     builder: (yargs) => {
       yargs
         .option('stats', {
+          type: 'boolean',
           default: false,
           describe: 'Aggregate the results'
         })
         .option('cache', {
+          type: 'boolean',
           default: false,
-          describe: 'Cache the responses from Jenkins in .ncu/cache/ under' +
-                    ' the node-core-utils installation directory'
+          describe: 'Cache the responses from Jenkins in $tmpdir/ncu/cache for testing'
         })
         .option('limit', {
           default: 15,

components/git/release.js

@@ -28,9 +28,9 @@ const releaseOptions = {
     describe: 'Promote new release of Node.js',
     type: 'boolean'
   },
-  'gpg-sign': {
-    describe: 'GPG-sign commits, will be passed to the git process',
-    alias: 'S'
+  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',
@@ -44,13 +44,22 @@ const releaseOptions = {
     describe: 'Labels separated by "," to filter security PRs',
     type: 'string'
   },
+  'gpg-sign': {
+    describe: 'GPG-sign commits, will be passed to the git process',
+    alias: 'S'
+  },
   skipBranchDiff: {
     describe: 'Skips the initial branch-diff check when preparing releases',
     type: 'boolean'
   },
   startLTS: {
     describe: 'Mark the release as the transition from Current to LTS',
     type: 'boolean'
+  },
+  yes: {
+    type: 'boolean',
+    default: false,
+    describe: 'Skip all prompts and run non-interactively'
   }
 };
 
@@ -90,6 +99,10 @@ function release(state, argv) {
   const cli = new CLI(logStream);
   const dir = process.cwd();
 
+  if (argv.yes) {
+    cli.setAssumeYes();
+  }
+
   return runPromise(main(state, argv, cli, dir)).catch((err) => {
     if (cli.spinner.enabled) {
       cli.spinner.fail();

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,7 +223,10 @@ 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]
+  --yes       Skip all prompts and run non-interactively               [boolean]
   --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
@@ -462,7 +465,7 @@ It will retrieve all the triaged HackerOne reports and add creates the `vulnerab
 
 This command updates the `vulnerabilities.json` with target date of the security release.
 Example:
-  
+
 ```sh
   git node security --update-date=2023/12/31
 ```
@@ -471,7 +474,7 @@ Example:
 
 This command creates a pre-release announcement for the security release.
 Example:
-  
+
 ```sh
   git node security --pre-release
 ```

docs/ncu-ci.md

@@ -111,7 +111,7 @@ Possible use cases:
    is run, it picks up cached data written on disk for jobs whose results
    are known.
 
-   Note: results are cached in `${ncu_installation_path}/.ncu/cache`, so you
+   Note: results are cached in `$tmpdir/ncu/cache`, so you
    may want to clean it up from time to time.
 
    ```

lib/cache.js

@@ -1,24 +1,22 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import { fileURLToPath } from 'node:url';
+import os from 'node:os';
 
 import { writeJson, readJson, writeFile, readFile } from './file.js';
 
 function isAsync(fn) {
   return fn[Symbol.toStringTag] === 'AsyncFunction';
 }
 
-const parentDir = fileURLToPath(new URL('..', import.meta.url));
-
 export default class Cache {
   constructor(dir) {
-    this.dir = dir || this.computeCacheDir(parentDir);
+    this.dir = dir || this.computeCacheDir(os.tmpdir());
     this.originals = {};
     this.disabled = true;
   }
 
   computeCacheDir(base) {
-    return path.join(base, '.ncu', 'cache');
+    return path.join(base, 'ncu', 'cache');
   }
 
   disable() {

lib/cli.js

@@ -1,6 +1,6 @@
 import ora from 'ora';
 import chalk from 'chalk';
-import inquirer from 'inquirer';
+import * as inquirer from '@inquirer/prompts';
 
 import { warning, error, info, success } from './figures.js';
 
@@ -81,12 +81,10 @@ export default class CLI {
       return defaultAnswer;
     }
 
-    const { answer } = await inquirer.prompt([{
-      type: questionType,
-      name: 'answer',
+    const answer = await inquirer[questionType]({
       message: question,
       default: defaultAnswer
-    }]);
+    });
 
     if (isSpinning) {
       this.spinner.start(spinningMessage);

lib/github/tree.js

@@ -35,7 +35,16 @@ export default class GitHubTree {
       branch,
       path
     });
-    return data.repository.ref.target.history.nodes[0].oid;
+
+    const targetHistoryNodes = data.repository.ref.target.history.nodes;
+    if (!targetHistoryNodes.length) {
+      this.cli.stopSpinner(
+        `Cannot find commit for "${path}". Please check the path name.`,
+        this.cli.SPINNER_STATUS.FAILED
+      );
+      throw new Error(`Cannot find commit for "${path}"`);
+    }
+    return targetHistoryNodes[0].oid;
   }
 
   /**