mirror of
				https://github.com/actions/cache.git
				synced 2025-10-31 20:08:36 +08:00 
			
		
		
		
	Merge branch 'main' into update-types/node16-to-20-and-v3-in-readmes
This commit is contained in:
		
						commit
						cbf0ae6904
					
				|  | @ -260,7 +260,7 @@ test("Fail restore when fail on cache miss is enabled and primary + restore keys | ||||||
|     ); |     ); | ||||||
| 
 | 
 | ||||||
|     expect(stateMock).toHaveBeenCalledWith("CACHE_KEY", key); |     expect(stateMock).toHaveBeenCalledWith("CACHE_KEY", key); | ||||||
|     expect(setCacheHitOutputMock).toHaveBeenCalledTimes(0); |     expect(setCacheHitOutputMock).toHaveBeenCalledTimes(1); | ||||||
| 
 | 
 | ||||||
|     expect(failedMock).toHaveBeenCalledWith( |     expect(failedMock).toHaveBeenCalledWith( | ||||||
|         `Failed to restore cache entry. Exiting as fail-on-cache-miss is set. Input key: ${key}` |         `Failed to restore cache entry. Exiting as fail-on-cache-miss is set. Input key: ${key}` | ||||||
|  |  | ||||||
|  | @ -86,7 +86,8 @@ test("restore with no cache found", async () => { | ||||||
|     ); |     ); | ||||||
| 
 | 
 | ||||||
|     expect(outputMock).toHaveBeenCalledWith("cache-primary-key", key); |     expect(outputMock).toHaveBeenCalledWith("cache-primary-key", key); | ||||||
|     expect(outputMock).toHaveBeenCalledTimes(1); |     expect(outputMock).toHaveBeenCalledWith("cache-hit", "false"); | ||||||
|  |     expect(outputMock).toHaveBeenCalledTimes(2); | ||||||
|     expect(failedMock).toHaveBeenCalledTimes(0); |     expect(failedMock).toHaveBeenCalledTimes(0); | ||||||
| 
 | 
 | ||||||
|     expect(infoMock).toHaveBeenCalledWith( |     expect(infoMock).toHaveBeenCalledWith( | ||||||
|  |  | ||||||
							
								
								
									
										1
									
								
								dist/restore-only/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								dist/restore-only/index.js
									
									
									
									
										vendored
									
									
								
							|  | @ -59415,6 +59415,7 @@ function restoreImpl(stateProvider, earlyExit) { | ||||||
|             const lookupOnly = utils.getInputAsBool(constants_1.Inputs.LookupOnly); |             const lookupOnly = utils.getInputAsBool(constants_1.Inputs.LookupOnly); | ||||||
|             const cacheKey = yield cache.restoreCache(cachePaths, primaryKey, restoreKeys, { lookupOnly: lookupOnly }, enableCrossOsArchive); |             const cacheKey = yield cache.restoreCache(cachePaths, primaryKey, restoreKeys, { lookupOnly: lookupOnly }, enableCrossOsArchive); | ||||||
|             if (!cacheKey) { |             if (!cacheKey) { | ||||||
|  |                 core.setOutput(constants_1.Outputs.CacheHit, false.toString()); | ||||||
|                 if (failOnCacheMiss) { |                 if (failOnCacheMiss) { | ||||||
|                     throw new Error(`Failed to restore cache entry. Exiting as fail-on-cache-miss is set. Input key: ${primaryKey}`); |                     throw new Error(`Failed to restore cache entry. Exiting as fail-on-cache-miss is set. Input key: ${primaryKey}`); | ||||||
|                 } |                 } | ||||||
|  |  | ||||||
							
								
								
									
										1
									
								
								dist/restore/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								dist/restore/index.js
									
									
									
									
										vendored
									
									
								
							|  | @ -59415,6 +59415,7 @@ function restoreImpl(stateProvider, earlyExit) { | ||||||
|             const lookupOnly = utils.getInputAsBool(constants_1.Inputs.LookupOnly); |             const lookupOnly = utils.getInputAsBool(constants_1.Inputs.LookupOnly); | ||||||
|             const cacheKey = yield cache.restoreCache(cachePaths, primaryKey, restoreKeys, { lookupOnly: lookupOnly }, enableCrossOsArchive); |             const cacheKey = yield cache.restoreCache(cachePaths, primaryKey, restoreKeys, { lookupOnly: lookupOnly }, enableCrossOsArchive); | ||||||
|             if (!cacheKey) { |             if (!cacheKey) { | ||||||
|  |                 core.setOutput(constants_1.Outputs.CacheHit, false.toString()); | ||||||
|                 if (failOnCacheMiss) { |                 if (failOnCacheMiss) { | ||||||
|                     throw new Error(`Failed to restore cache entry. Exiting as fail-on-cache-miss is set. Input key: ${primaryKey}`); |                     throw new Error(`Failed to restore cache entry. Exiting as fail-on-cache-miss is set. Input key: ${primaryKey}`); | ||||||
|                 } |                 } | ||||||
|  |  | ||||||
|  | @ -513,6 +513,7 @@ jobs: | ||||||
| ```yaml | ```yaml | ||||||
| - name: Get pip cache dir | - name: Get pip cache dir | ||||||
|   id: pip-cache |   id: pip-cache | ||||||
|  |   shell: bash | ||||||
|   run: | |   run: | | ||||||
|     echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT |     echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -51,6 +51,7 @@ export async function restoreImpl( | ||||||
|         ); |         ); | ||||||
| 
 | 
 | ||||||
|         if (!cacheKey) { |         if (!cacheKey) { | ||||||
|  |             core.setOutput(Outputs.CacheHit, false.toString()); | ||||||
|             if (failOnCacheMiss) { |             if (failOnCacheMiss) { | ||||||
|                 throw new Error( |                 throw new Error( | ||||||
|                     `Failed to restore cache entry. Exiting as fail-on-cache-miss is set. Input key: ${primaryKey}` |                     `Failed to restore cache entry. Exiting as fail-on-cache-miss is set. Input key: ${primaryKey}` | ||||||
|  | @ -62,7 +63,6 @@ export async function restoreImpl( | ||||||
|                     ...restoreKeys |                     ...restoreKeys | ||||||
|                 ].join(", ")}` |                 ].join(", ")}` | ||||||
|             ); |             ); | ||||||
| 
 |  | ||||||
|             return; |             return; | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Bernhard Kaindl
						Bernhard Kaindl