mirror of
				https://github.com/actions/cache.git
				synced 2025-11-04 21:39:09 +08:00 
			
		
		
		
	Merge branch 'master' of http://github.com/actions/cache into with-retries
This commit is contained in:
		
							
								
								
									
										9
									
								
								dist/restore/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								dist/restore/index.js
									
									
									
									
										vendored
									
									
								
							@@ -2376,7 +2376,7 @@ function getContentRange(start, end) {
 | 
			
		||||
    // Content-Range: bytes 0-199/*
 | 
			
		||||
    return `bytes ${start}-${end}/*`;
 | 
			
		||||
}
 | 
			
		||||
function uploadChunk(httpClient, resourceUrl, data, start, end) {
 | 
			
		||||
function uploadChunk(httpClient, resourceUrl, openStream, start, end) {
 | 
			
		||||
    return __awaiter(this, void 0, void 0, function* () {
 | 
			
		||||
        core.debug(`Uploading chunk of size ${end -
 | 
			
		||||
            start +
 | 
			
		||||
@@ -2385,7 +2385,7 @@ function uploadChunk(httpClient, resourceUrl, data, start, end) {
 | 
			
		||||
            "Content-Type": "application/octet-stream",
 | 
			
		||||
            "Content-Range": getContentRange(start, end)
 | 
			
		||||
        };
 | 
			
		||||
        yield retryHttpClientResponse(`uploadChunk (start: ${start}, end: ${end})`, () => httpClient.sendStream("PATCH", resourceUrl, data, additionalHeaders));
 | 
			
		||||
        yield retryHttpClientResponse(`uploadChunk (start: ${start}, end: ${end})`, () => httpClient.sendStream("PATCH", resourceUrl, openStream(), additionalHeaders));
 | 
			
		||||
    });
 | 
			
		||||
}
 | 
			
		||||
function parseEnvNumber(key) {
 | 
			
		||||
@@ -2415,13 +2415,12 @@ function uploadFile(httpClient, cacheId, archivePath) {
 | 
			
		||||
                    const start = offset;
 | 
			
		||||
                    const end = offset + chunkSize - 1;
 | 
			
		||||
                    offset += MAX_CHUNK_SIZE;
 | 
			
		||||
                    const chunk = fs.createReadStream(archivePath, {
 | 
			
		||||
                    yield uploadChunk(httpClient, resourceUrl, () => fs.createReadStream(archivePath, {
 | 
			
		||||
                        fd,
 | 
			
		||||
                        start,
 | 
			
		||||
                        end,
 | 
			
		||||
                        autoClose: false
 | 
			
		||||
                    });
 | 
			
		||||
                    yield uploadChunk(httpClient, resourceUrl, chunk, start, end);
 | 
			
		||||
                    }), start, end);
 | 
			
		||||
                }
 | 
			
		||||
            })));
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user