From 03bcea1baca1ccca46634f2b5e81f7467e85d600 Mon Sep 17 00:00:00 2001 From: Bassem Dghaidi <568794+Link-@users.noreply.github.com> Date: Mon, 21 Oct 2024 04:21:27 -0700 Subject: [PATCH] Fix order of operations bug in restore cache --- dist/restore-only/index.js | 6 +++--- dist/restore/index.js | 6 +++--- dist/save-only/index.js | 6 +++--- dist/save/index.js | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dist/restore-only/index.js b/dist/restore-only/index.js index eee0e4d..39a8f04 100644 --- a/dist/restore-only/index.js +++ b/dist/restore-only/index.js @@ -27877,14 +27877,14 @@ function restoreCachev2(paths, primaryKey, restoreKeys, options, enableCrossOsAr } archivePath = path.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core.debug(`Archive path: ${archivePath}`); - if (core.isDebug()) { - yield (0, tar_1.listTar)(archivePath, compressionMethod); - } core.debug(`Starting download of artifact to: ${archivePath}`); // Attempt to download the cache file from ABS yield (0, download_cache_1.DownloadCacheFile)(response.signedDownloadUrl, archivePath); const archiveFileSize = utils.getArchiveFileSizeInBytes(archivePath); core.info(`Cache Size: ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B)`); + if (core.isDebug()) { + yield (0, tar_1.listTar)(archivePath, compressionMethod); + } yield (0, tar_1.extractTar)(archivePath, compressionMethod); core.info('Cache restored successfully'); return request.key; diff --git a/dist/restore/index.js b/dist/restore/index.js index 6a92535..7613f4d 100644 --- a/dist/restore/index.js +++ b/dist/restore/index.js @@ -27877,14 +27877,14 @@ function restoreCachev2(paths, primaryKey, restoreKeys, options, enableCrossOsAr } archivePath = path.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core.debug(`Archive path: ${archivePath}`); - if (core.isDebug()) { - yield (0, tar_1.listTar)(archivePath, compressionMethod); - } core.debug(`Starting download of artifact to: ${archivePath}`); // Attempt to download the cache file from ABS yield (0, download_cache_1.DownloadCacheFile)(response.signedDownloadUrl, archivePath); const archiveFileSize = utils.getArchiveFileSizeInBytes(archivePath); core.info(`Cache Size: ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B)`); + if (core.isDebug()) { + yield (0, tar_1.listTar)(archivePath, compressionMethod); + } yield (0, tar_1.extractTar)(archivePath, compressionMethod); core.info('Cache restored successfully'); return request.key; diff --git a/dist/save-only/index.js b/dist/save-only/index.js index a7a28c5..5500790 100644 --- a/dist/save-only/index.js +++ b/dist/save-only/index.js @@ -27877,14 +27877,14 @@ function restoreCachev2(paths, primaryKey, restoreKeys, options, enableCrossOsAr } archivePath = path.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core.debug(`Archive path: ${archivePath}`); - if (core.isDebug()) { - yield (0, tar_1.listTar)(archivePath, compressionMethod); - } core.debug(`Starting download of artifact to: ${archivePath}`); // Attempt to download the cache file from ABS yield (0, download_cache_1.DownloadCacheFile)(response.signedDownloadUrl, archivePath); const archiveFileSize = utils.getArchiveFileSizeInBytes(archivePath); core.info(`Cache Size: ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B)`); + if (core.isDebug()) { + yield (0, tar_1.listTar)(archivePath, compressionMethod); + } yield (0, tar_1.extractTar)(archivePath, compressionMethod); core.info('Cache restored successfully'); return request.key; diff --git a/dist/save/index.js b/dist/save/index.js index 9e62d50..f96631a 100644 --- a/dist/save/index.js +++ b/dist/save/index.js @@ -27877,14 +27877,14 @@ function restoreCachev2(paths, primaryKey, restoreKeys, options, enableCrossOsAr } archivePath = path.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core.debug(`Archive path: ${archivePath}`); - if (core.isDebug()) { - yield (0, tar_1.listTar)(archivePath, compressionMethod); - } core.debug(`Starting download of artifact to: ${archivePath}`); // Attempt to download the cache file from ABS yield (0, download_cache_1.DownloadCacheFile)(response.signedDownloadUrl, archivePath); const archiveFileSize = utils.getArchiveFileSizeInBytes(archivePath); core.info(`Cache Size: ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B)`); + if (core.isDebug()) { + yield (0, tar_1.listTar)(archivePath, compressionMethod); + } yield (0, tar_1.extractTar)(archivePath, compressionMethod); core.info('Cache restored successfully'); return request.key;