segment 98 mb with logs

Hotfix Zstd breaking due to version change in runners

packages/cache/RELEASES.md

@@ -114,4 +114,7 @@
 - Fix issue with symlink restoration on windows.
 
 ### 3.1.3
-- Fix to prevent from setting MYSYS environement variable globally [#1329](https://github.com/actions/toolkit/pull/1329).
+- Fix to prevent from setting MYSYS environement variable globally [#1329](https://github.com/actions/toolkit/pull/1329).
+
+### 3.1.4
+- Fix zstd not being used due to `zstd --version` output change in zstd 1.5.4 release. See [#1353](https://github.com/actions/toolkit/pull/1353).

packages/cache/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@actions/cache",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@actions/cache",
-      "version": "3.1.3",
+      "version": "3.1.4",
       "license": "MIT",
       "dependencies": {
         "@actions/core": "^1.10.0",

packages/cache/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/cache",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "preview": true,
   "description": "Actions cache lib",
   "keywords": [

packages/cache/src/internal/cacheUtils.ts

@@ -71,11 +71,15 @@ export async function unlinkFile(filePath: fs.PathLike): Promise<void> {
   return util.promisify(fs.unlink)(filePath)
 }
 
-async function getVersion(app: string): Promise<string> {
-  core.debug(`Checking ${app} --version`)
+async function getVersion(
+  app: string,
+  additionalArgs: string[] = []
+): Promise<string> {
   let versionOutput = ''
+  additionalArgs.push('--version')
+  core.debug(`Checking ${app} ${additionalArgs.join(' ')}`)
   try {
-    await exec.exec(`${app} --version`, [], {
+    await exec.exec(`${app}`, additionalArgs, {
       ignoreReturnCode: true,
       silent: true,
       listeners: {
@@ -94,18 +98,14 @@ async function getVersion(app: string): Promise<string> {
 
 // Use zstandard if possible to maximize cache performance
 export async function getCompressionMethod(): Promise<CompressionMethod> {
-  const versionOutput = await getVersion('zstd')
+  const versionOutput = await getVersion('zstd', ['--quiet'])
   const version = semver.clean(versionOutput)
+  core.debug(`zstd version: ${version}`)
 
-  if (!versionOutput.toLowerCase().includes('zstd command line interface')) {
-    // zstd is not installed
+  if (versionOutput === '') {
     return CompressionMethod.Gzip
-  } else if (!version || semver.lt(version, 'v1.3.2')) {
-    // zstd is installed but using a version earlier than v1.3.2
-    // v1.3.2 is required to use the `--long` options in zstd
-    return CompressionMethod.ZstdWithoutLong
   } else {
-    return CompressionMethod.Zstd
+    return CompressionMethod.ZstdWithoutLong
   }
 }
 

packages/cache/src/internal/downloadUtils.ts

@@ -242,7 +242,7 @@ export async function downloadCacheStorageSDK(
     // If the file exceeds the buffer maximum length (~1 GB on 32-bit systems and ~2 GB
     // on 64-bit systems), split the download into multiple segments
     // ~2 GB = 2147483647, beyond this, we start getting out of range error. So, capping it accordingly.
-    const maxSegmentSize = Math.min(2147483647, buffer.constants.MAX_LENGTH)
+    const maxSegmentSize = Math.min(102760447, buffer.constants.MAX_LENGTH)
     const downloadProgress = new DownloadProgress(contentLength)
 
     const fd = fs.openSync(archivePath, 'w')
@@ -275,7 +275,23 @@ export async function downloadCacheStorageSDK(
             'Aborting cache download as the download time exceeded the timeout.'
           )
         } else if (Buffer.isBuffer(result)) {
+          core.info(
+            `Segment offset before writing result to the file ${downloadProgress.segmentOffset}`
+          )
+          core.info(
+            `Download progress object before writing result ${JSON.stringify(
+              downloadProgress
+            )}`
+          )
           fs.writeFileSync(fd, result)
+          core.info(
+            `Segment offset after writing result to the file ${downloadProgress.segmentOffset}`
+          )
+          core.info(
+            `Download progress object after writing result ${JSON.stringify(
+              downloadProgress
+            )}`
+          )
         }
       }
     } finally {