diff --git a/dist/restore/index.js b/dist/restore/index.js index bf61870a..06029689 100644 --- a/dist/restore/index.js +++ b/dist/restore/index.js @@ -59595,7 +59595,7 @@ async function restore(ccacheVariant) { const keyPrefix = ccacheVariant + "-"; const primaryKey = inputs.primaryKey ? keyPrefix + inputs.primaryKey + "-" : keyPrefix; const restoreKeys = inputs.restoreKeys.map(k => keyPrefix + k + "-"); - const paths = [`.${ccacheVariant}`]; + const paths = [`../${ccacheVariant}`]; core.saveState("primaryKey", primaryKey); const shouldRestore = core.getBooleanInput("restore"); if (!shouldRestore) { @@ -59620,7 +59620,7 @@ async function configure(ccacheVariant, platform) { const ghWorkSpace = external_process_namespaceObject.env.GITHUB_WORKSPACE || "unreachable, make ncc happy"; const maxSize = core.getInput('max-size'); if (ccacheVariant === "ccache") { - await execBash(`ccache --set-config=cache_dir='${external_path_default().join(ghWorkSpace, '.ccache')}'`); + await execBash(`ccache --set-config=cache_dir='${external_path_default().join(ghWorkSpace, '..', 'ccache')}'`); await execBash(`ccache --set-config=max_size='${maxSize}'`); await execBash(`ccache --set-config=compression=true`); if (platform === "darwin") { @@ -59630,7 +59630,7 @@ async function configure(ccacheVariant, platform) { await execBash("ccache -p"); } else { - const options = `SCCACHE_IDLE_TIMEOUT=0 SCCACHE_DIR='${ghWorkSpace}'/.sccache SCCACHE_CACHE_SIZE='${maxSize}'`; + const options = `SCCACHE_IDLE_TIMEOUT=0 SCCACHE_DIR='${ghWorkSpace}'/../sccache SCCACHE_CACHE_SIZE='${maxSize}'`; await execBash(`env ${options} sccache --start-server`); } } diff --git a/src/restore.ts b/src/restore.ts index 024d4f9f..f2fcfcee 100644 --- a/src/restore.ts +++ b/src/restore.ts @@ -22,7 +22,7 @@ async function restore(ccacheVariant : string) : Promise<void> { const keyPrefix = ccacheVariant + "-"; const primaryKey = inputs.primaryKey ? keyPrefix + inputs.primaryKey + "-" : keyPrefix; const restoreKeys = inputs.restoreKeys.map(k => keyPrefix + k + "-") - const paths = [`.${ccacheVariant}`]; + const paths = [`../${ccacheVariant}`]; core.saveState("primaryKey", primaryKey); @@ -50,7 +50,7 @@ async function configure(ccacheVariant : string, platform : string) : Promise<vo const maxSize = core.getInput('max-size'); if (ccacheVariant === "ccache") { - await execBash(`ccache --set-config=cache_dir='${path.join(ghWorkSpace, '.ccache')}'`); + await execBash(`ccache --set-config=cache_dir='${path.join(ghWorkSpace, '..', 'ccache')}'`); await execBash(`ccache --set-config=max_size='${maxSize}'`); await execBash(`ccache --set-config=compression=true`); if (platform === "darwin") { @@ -59,7 +59,7 @@ async function configure(ccacheVariant : string, platform : string) : Promise<vo core.info("Cccache config:"); await execBash("ccache -p"); } else { - const options = `SCCACHE_IDLE_TIMEOUT=0 SCCACHE_DIR='${ghWorkSpace}'/.sccache SCCACHE_CACHE_SIZE='${maxSize}'`; + const options = `SCCACHE_IDLE_TIMEOUT=0 SCCACHE_DIR='${ghWorkSpace}'/../sccache SCCACHE_CACHE_SIZE='${maxSize}'`; await execBash(`env ${options} sccache --start-server`); }