Rebase and rebuild
This commit is contained in:
parent
96e5a46c57
commit
7c7d003bbb
|
@ -3036,12 +3036,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",
|
||||||
|
|
|
@ -3017,12 +3017,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 New Issue