Merge ead69d56d0 into 53b83947a5

.github/workflows/e2e-cache.yml

@@ -46,7 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Install pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4
         with:
           version: 6.10.0
       - name: Generate pnpm file

__tests__/main.test.ts

@@ -135,10 +135,11 @@ describe('main tests', () => {
 
   describe('printEnvDetailsAndSetOutput', () => {
     it.each([
-      [{node: '12.0.2', npm: '6.3.3', yarn: '1.22.11'}],
-      [{node: '16.0.2', npm: '7.3.3', yarn: '2.22.11'}],
-      [{node: '14.0.1', npm: '8.1.0', yarn: '3.2.1'}],
-      [{node: '17.0.2', npm: '6.3.3', yarn: ''}]
+      [{node: '12.0.2', npm: '6.3.3', yarn: '1.22.11', pnpm: ''}],
+      [{node: '16.0.2', npm: '7.3.3', yarn: '2.22.11', pnpm: ''}],
+      [{node: '14.0.1', npm: '8.1.0', yarn: '3.2.1', pnpm: ''}],
+      [{node: '17.0.2', npm: '6.3.3', yarn: '', pnpm: ''}],
+      [{node: '24.10.0', npm: '11.6.1', yarn: '', pnpm: '10.18.3'}]
     ])('Tools versions %p', async obj => {
       getExecOutputSpy.mockImplementation(async command => {
         if (Reflect.has(obj, command) && !obj[command]) {

dist/cache-save/index.js

@@ -71976,7 +71976,7 @@ function getNodeVersionFromFile(versionFilePath) {
 }
 async function printEnvDetailsAndSetOutput() {
     core.startGroup('Environment details');
-    const promises = ['node', 'npm', 'yarn'].map(async (tool) => {
+    const promises = ['node', 'npm', 'yarn', 'pnpm'].map(async (tool) => {
         const pathTool = await io.which(tool, false);
         const output = pathTool ? await getToolVersion(tool, ['--version']) : '';
         return { tool, output };

dist/setup/index.js

@@ -82513,7 +82513,7 @@ function getNodeVersionFromFile(versionFilePath) {
 }
 async function printEnvDetailsAndSetOutput() {
     core.startGroup('Environment details');
-    const promises = ['node', 'npm', 'yarn'].map(async (tool) => {
+    const promises = ['node', 'npm', 'yarn', 'pnpm'].map(async (tool) => {
         const pathTool = await io.which(tool, false);
         const output = pathTool ? await getToolVersion(tool, ['--version']) : '';
         return { tool, output };

src/util.ts

@@ -74,7 +74,7 @@ export function getNodeVersionFromFile(versionFilePath: string): string | null {
 
 export async function printEnvDetailsAndSetOutput() {
   core.startGroup('Environment details');
-  const promises = ['node', 'npm', 'yarn'].map(async tool => {
+  const promises = ['node', 'npm', 'yarn', 'pnpm'].map(async tool => {
     const pathTool = await io.which(tool, false);
     const output = pathTool ? await getToolVersion(tool, ['--version']) : '';