Merge pull request #122 from nix-community/118-bug-cant-save-a-cache

Fix saving a cache

Author: deemp

deps/actions/toolkit

@@ -12,6 +12,7 @@ import * as utils from "./utils/action";
 import { cache } from "./utils/cacheBackend";
 import { collectGarbage } from "./utils/collectGarbage";
 import { purgeCacheByKey, purgeCaches } from "./utils/purge";
+import { TarCommandModifiers } from "actions/toolkit/packages/cache/src/options";
 
 // Catch and log any unhandled exceptions.  These exceptions can leak out of the uploadChunk method in
 // @actions/toolkit when a failed upload closes the file descriptor causing any in-process reads to
@@ -84,11 +85,11 @@ export async function saveImpl(
                     Not saving a new cache.
                     `
                 );
-                
+
                 // Since we don't save a cache
-                // it's probably safe to set the value 
-                // to something other than -1 
-                // so that the warning 
+                // it's probably safe to set the value
+                // to something other than -1
+                // so that the warning
                 // in the try block in saveOnlyRun
                 // is not printed
                 cacheId = 0;
@@ -99,7 +100,10 @@ export async function saveImpl(
 
                 utils.info(`Saving a new cache with the key "${primaryKey}".`);
 
-                const extraTarArgs = await utils.prepareExcludeFromFile(false);
+                let tarCommandModifiers = new TarCommandModifiers();
+
+                tarCommandModifiers.createArgs =
+                    await utils.prepareExcludeFromFile(false);
 
                 // can throw
                 cacheId = await cache.saveCache(
@@ -109,7 +113,7 @@ export async function saveImpl(
                         uploadChunkSize: inputs.uploadChunkSize
                     },
                     undefined,
-                    extraTarArgs
+                    tarCommandModifiers
                 );
 
                 utils.info(

deps/buildjet/toolkit

@@ -8,6 +8,7 @@ import { devNull } from "os";
 import { Inputs, RefKey } from "../constants";
 import * as inputs from "../inputs";
 import { cache, cacheUtils } from "./cacheBackend";
+import { TarCommandModifiers } from "actions/toolkit/packages/cache/src/options";
 
 const myDedent = dedent.withOptions({});
 
@@ -99,8 +100,7 @@ export async function prepareExcludeFromFile(forRestore: boolean) {
     const tmp = await cacheUtils.createTempDirectory();
     const excludeFromFile = `${tmp}/paths`;
     fs.writeFileSync(excludeFromFile, excludePaths.join("\n"));
-    const extraTarArgs = ["--exclude-from", excludeFromFile];
-    return extraTarArgs;
+    return ["--exclude-from", excludeFromFile];
 }
 
 export async function restoreCache({
@@ -112,10 +112,10 @@ export async function restoreCache({
     restoreKeys: string[];
     lookupOnly: boolean;
 }) {
-    let extraTarArgs: string[] = [];
+    let tarCommandModifiers = new TarCommandModifiers();
 
     if (inputs.nix && !lookupOnly) {
-        extraTarArgs = await prepareExcludeFromFile(true);
+        tarCommandModifiers.extractArgs = await prepareExcludeFromFile(true);
 
         info(`::group::Logs produced while restoring a cache.`);
     }
@@ -128,7 +128,7 @@ export async function restoreCache({
         restoreKeys,
         { lookupOnly },
         false,
-        extraTarArgs
+        tarCommandModifiers
     );
 
     if (inputs.nix && !lookupOnly) {