Rebase and rebuild

This commit is contained in:
Aiqiao Yan 2020-04-10 15:34:34 -04:00 committed by Aiqiao Yan
parent 96e5a46c57
commit 7c7d003bbb
2 changed files with 2 additions and 10 deletions

View File

@ -3036,12 +3036,8 @@ function createTar(archiveFolder, sourceDirectories) {
const args = [
"-cz",
"-f",
<<<<<<< HEAD
constants_1.CacheFilename,
"-P",
=======
(_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"),
>>>>>>> Fallback to GNU tar if BSD tar is unavailable
"-P",
"-C",
(_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"),
"--files-from",

6
dist/save/index.js vendored
View File

@ -3017,12 +3017,8 @@ function createTar(archiveFolder, sourceDirectories) {
const args = [
"-cz",
"-f",
<<<<<<< HEAD
constants_1.CacheFilename,
"-P",
=======
(_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"),
>>>>>>> Fallback to GNU tar if BSD tar is unavailable
"-P",
"-C",
(_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"),
"--files-from",