Fix tests and rebuild

actions · Apr 4, 2022 · 168d1ea · 168d1ea
1 parent 56d3584
commit 168d1ea
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/__tests__/cache-restore.test.ts b/__tests__/cache-restore.test.ts
@@ -193,27 +193,28 @@ virtualenvs.path = "{cache-dir}/virtualenvs"  # /Users/patrick/Library/Caches/py
 
   describe('Check if handleMatchResult', () => {
     it.each([
-      ['pip', '3.8.12', 'requirements.txt', 'someKey', true],
-      ['pipenv', '3.9.1', 'requirements.txt', 'someKey', true],
-      ['poetry', '3.8.12', 'requirements.txt', 'someKey', true],
-      ['pip', '3.9.2', 'requirements.txt', undefined, false],
-      ['pipenv', '3.8.12', 'requirements.txt', undefined, false],
-      ['poetry', '3.9.12', 'requirements.txt', undefined, false]
+      ['pip', '3.8.12', 'requirements.txt', 'someKey', 'someKey', true],
+      ['pipenv', '3.9.1', 'requirements.txt', 'someKey', 'someKey', true],
+      ['poetry', '3.8.12', 'requirements.txt', 'someKey', 'someKey', true],
+      ['pip', '3.9.2', 'requirements.txt', undefined, 'someKey', false],
+      ['pipenv', '3.8.12', 'requirements.txt', undefined, 'someKey', false],
+      ['poetry', '3.9.12', 'requirements.txt', undefined, 'someKey', false]
     ])(
       'sets correct outputs',
       async (
         packageManager,
         pythonVersion,
         dependencyFile,
         matchedKey,
+        restoredKey,
         expectedOutputValue
       ) => {
         const cacheDistributor = getCacheDistributor(
           packageManager,
           pythonVersion,
           dependencyFile
         );
-        cacheDistributor.handleMatchResult(matchedKey);
+        cacheDistributor.handleMatchResult(matchedKey, restoredKey);
         expect(setOutputSpy).toHaveBeenCalledWith(
           'cache-hit',
           expectedOutputValue

diff --git a/dist/cache-save/index.js b/dist/cache-save/index.js
@@ -37238,14 +37238,14 @@ class CacheDistributor {
         });
     }
     handleMatchResult(matchedKey, primaryKey) {
-        if (matchedKey == primaryKey) {
+        if (matchedKey) {
             core.saveState(State.CACHE_MATCHED_KEY, matchedKey);
             core.info(`Cache restored from key: ${matchedKey}`);
         }
         else {
             core.info(`${this.packageManager} cache is not found`);
         }
-        core.setOutput('cache-hit', Boolean(matchedKey));
+        core.setOutput('cache-hit', matchedKey === primaryKey);
     }
 }
 exports.default = CacheDistributor;

diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -42583,14 +42583,14 @@ class CacheDistributor {
         });
     }
     handleMatchResult(matchedKey, primaryKey) {
-        if (matchedKey == primaryKey) {
+        if (matchedKey) {
             core.saveState(State.CACHE_MATCHED_KEY, matchedKey);
             core.info(`Cache restored from key: ${matchedKey}`);
         }
         else {
             core.info(`${this.packageManager} cache is not found`);
         }
-        core.setOutput('cache-hit', Boolean(matchedKey));
+        core.setOutput('cache-hit', matchedKey === primaryKey);
     }
 }
 exports.default = CacheDistributor;