mirror of
https://code.forgejo.org/actions/cache.git
synced 2024-11-05 02:02:53 +01:00
Merge fixes
This commit is contained in:
parent
2403bbedac
commit
29b4783cc7
2 changed files with 0 additions and 8 deletions
4
dist/restore/index.js
vendored
4
dist/restore/index.js
vendored
|
@ -4554,7 +4554,6 @@ var Events;
|
|||
Events["Push"] = "push";
|
||||
Events["PullRequest"] = "pull_request";
|
||||
})(Events = exports.Events || (exports.Events = {}));
|
||||
<<<<<<< HEAD
|
||||
var CacheFilename;
|
||||
(function (CacheFilename) {
|
||||
CacheFilename["Gzip"] = "cache.tgz";
|
||||
|
@ -4569,10 +4568,7 @@ var CompressionMethod;
|
|||
// over the socket during this period, the socket is destroyed and the download
|
||||
// is aborted.
|
||||
exports.SocketTimeout = 5000;
|
||||
=======
|
||||
exports.RefKey = "GITHUB_REF";
|
||||
exports.CacheFilename = "cache.tgz";
|
||||
>>>>>>> Allow all events to access cache
|
||||
|
||||
|
||||
/***/ }),
|
||||
|
|
|
@ -7,7 +7,6 @@ import * as path from "path";
|
|||
import * as util from "util";
|
||||
import * as uuidV4 from "uuid/v4";
|
||||
|
||||
<<<<<<< HEAD
|
||||
import {
|
||||
CacheFilename,
|
||||
CompressionMethod,
|
||||
|
@ -15,9 +14,6 @@ import {
|
|||
RefKey,
|
||||
State
|
||||
} from "../constants";
|
||||
=======
|
||||
import { Outputs, RefKey, State } from "../constants";
|
||||
>>>>>>> Allow all events to access cache
|
||||
import { ArtifactCacheEntry } from "../contracts";
|
||||
|
||||
// From https://github.com/actions/toolkit/blob/master/packages/tool-cache/src/tool-cache.ts#L23
|
||||
|
|
Loading…
Reference in a new issue