mirror of
https://code.forgejo.org/actions/cache.git
synced 2024-12-23 12:36:01 +01:00
Rebase and rebuild
This commit is contained in:
parent
306f72536b
commit
7ccdf5c70d
2 changed files with 2 additions and 10 deletions
6
dist/restore/index.js
vendored
6
dist/restore/index.js
vendored
|
@ -5041,12 +5041,8 @@ function createTar(archiveFolder, sourceDirectories) {
|
||||||
const args = [
|
const args = [
|
||||||
"-cz",
|
"-cz",
|
||||||
"-f",
|
"-f",
|
||||||
<<<<<<< HEAD
|
|
||||||
constants_1.CacheFilename,
|
|
||||||
"-P",
|
|
||||||
=======
|
|
||||||
(_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"),
|
(_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"),
|
||||||
>>>>>>> Fallback to GNU tar if BSD tar is unavailable
|
"-P",
|
||||||
"-C",
|
"-C",
|
||||||
(_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"),
|
(_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"),
|
||||||
"--files-from",
|
"--files-from",
|
||||||
|
|
6
dist/save/index.js
vendored
6
dist/save/index.js
vendored
|
@ -5018,12 +5018,8 @@ function createTar(archiveFolder, sourceDirectories) {
|
||||||
const args = [
|
const args = [
|
||||||
"-cz",
|
"-cz",
|
||||||
"-f",
|
"-f",
|
||||||
<<<<<<< HEAD
|
|
||||||
constants_1.CacheFilename,
|
|
||||||
"-P",
|
|
||||||
=======
|
|
||||||
(_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"),
|
(_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"),
|
||||||
>>>>>>> Fallback to GNU tar if BSD tar is unavailable
|
"-P",
|
||||||
"-C",
|
"-C",
|
||||||
(_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"),
|
(_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"),
|
||||||
"--files-from",
|
"--files-from",
|
||||||
|
|
Loading…
Reference in a new issue