neil/cache
1
0
Fork 0
mirror of https://github.com/actions/cache.git synced 2025-10-31 18:34:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Aiqiao Yan 2020-05-11 10:18:19 -04:00
parent 2403bbedac
commit 29b4783cc7
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/restore/index.js vendored
View File

@ -4554,7 +4554,6 @@ var Events;
Events["Push"] = "push"; Events["Push"] = "push";
Events["PullRequest"] = "pull_request"; Events["PullRequest"] = "pull_request";
})(Events = exports.Events || (exports.Events = {})); })(Events = exports.Events || (exports.Events = {}));
<<<<<<< HEAD
var CacheFilename; var CacheFilename;
(function (CacheFilename) { (function (CacheFilename) {
CacheFilename["Gzip"] = "cache.tgz"; CacheFilename["Gzip"] = "cache.tgz";
@ -4569,10 +4568,7 @@ var CompressionMethod;
// over the socket during this period, the socket is destroyed and the download // over the socket during this period, the socket is destroyed and the download
// is aborted. // is aborted.
exports.SocketTimeout = 5000; exports.SocketTimeout = 5000;
=======
exports.RefKey = "GITHUB_REF"; exports.RefKey = "GITHUB_REF";
exports.CacheFilename = "cache.tgz";
>>>>>>> Allow all events to access cache
/***/ }), /***/ }),

4
src/utils/actionUtils.ts
View File

@ -7,7 +7,6 @@ import * as path from "path";
import * as util from "util"; import * as util from "util";
import * as uuidV4 from "uuid/v4"; import * as uuidV4 from "uuid/v4";
<<<<<<< HEAD
import { import {
CacheFilename, CacheFilename,
CompressionMethod, CompressionMethod,
@ -15,9 +14,6 @@ import {
RefKey, RefKey,
State State
} from "../constants"; } from "../constants";
=======
import { Outputs, RefKey, State } from "../constants";
>>>>>>> Allow all events to access cache
import { ArtifactCacheEntry } from "../contracts"; import { ArtifactCacheEntry } from "../contracts";
// From https://github.com/actions/toolkit/blob/master/packages/tool-cache/src/tool-cache.ts#L23 // From https://github.com/actions/toolkit/blob/master/packages/tool-cache/src/tool-cache.ts#L23