Merge pull request #383 from akv-platform/issue-368
Add imageOS to primaryKey
This commit is contained in:
		
						commit
						08b314a573
					
				
							
								
								
									
										3
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							| @ -61155,7 +61155,8 @@ const restoreCache = (versionSpec, packageManager, cacheDependencyPath) => __awa | |||||||
|     if (!fileHash) { |     if (!fileHash) { | ||||||
|         throw new Error('Some specified paths were not resolved, unable to cache dependencies.'); |         throw new Error('Some specified paths were not resolved, unable to cache dependencies.'); | ||||||
|     } |     } | ||||||
|     const primaryKey = `setup-go-${platform}-go-${versionSpec}-${fileHash}`; |     const linuxVersion = process.env.RUNNER_OS === 'Linux' ? `${process.env.ImageOS}-` : ''; | ||||||
|  |     const primaryKey = `setup-go-${platform}-${linuxVersion}go-${versionSpec}-${fileHash}`; | ||||||
|     core.debug(`primary key is ${primaryKey}`); |     core.debug(`primary key is ${primaryKey}`); | ||||||
|     core.saveState(constants_1.State.CachePrimaryKey, primaryKey); |     core.saveState(constants_1.State.CachePrimaryKey, primaryKey); | ||||||
|     const cacheKey = yield cache.restoreCache(cachePaths, primaryKey); |     const cacheKey = yield cache.restoreCache(cachePaths, primaryKey); | ||||||
|  | |||||||
| @ -29,7 +29,9 @@ export const restoreCache = async ( | |||||||
|     ); |     ); | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   const primaryKey = `setup-go-${platform}-go-${versionSpec}-${fileHash}`; |   const linuxVersion = | ||||||
|  |     process.env.RUNNER_OS === 'Linux' ? `${process.env.ImageOS}-` : ''; | ||||||
|  |   const primaryKey = `setup-go-${platform}-${linuxVersion}go-${versionSpec}-${fileHash}`; | ||||||
|   core.debug(`primary key is ${primaryKey}`); |   core.debug(`primary key is ${primaryKey}`); | ||||||
| 
 | 
 | ||||||
|   core.saveState(State.CachePrimaryKey, primaryKey); |   core.saveState(State.CachePrimaryKey, primaryKey); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user