Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use sparse operations by default #197

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Use sparse operations by default #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a21d66a
Use sparse operations by default
aledbf Dec 31, 2024
7cbd96b
Missing sparse
aledbf Dec 31, 2024
ffb56b7
Fix
aledbf Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions pkg/leeway/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@ func (p *Package) buildYarn(buildctx *buildContext, wd, result string) (bld *pac
} else {
commands[PackageBuildPhasePrep] = append(commands[PackageBuildPhasePrep], [][]string{
{"mkdir", tgt},
{"tar", "xfz", builtpkg, "--no-same-owner", "-C", tgt},
{"tar", "--sparse", "-xzf", builtpkg, "--no-same-owner", "-C", tgt},
}...)
}
}
Expand Down Expand Up @@ -1103,7 +1103,7 @@ func (p *Package) buildYarn(buildctx *buildContext, wd, result string) (bld *pac
{"sh", "-c", fmt.Sprintf("yarn generate-lock-entry --resolved file://./%s > _mirror/content_yarn.lock", dst)},
{"sh", "-c", "cat yarn.lock >> _mirror/content_yarn.lock"},
{"yarn", "pack", "--filename", dst},
{"tar", "cf", result, fmt.Sprintf("--use-compress-program=%v", compressor), "-C", "_mirror", "."},
{"tar", "--sparse", "-cf", result, fmt.Sprintf("--use-compress-program=%v", compressor), "-C", "_mirror", "."},
}...)
resultDir = "_mirror"
} else if cfg.Packaging == YarnLibrary {
Expand All @@ -1127,11 +1127,11 @@ func (p *Package) buildYarn(buildctx *buildContext, wd, result string) (bld *pac
{"yarn", "pack", "--filename", pkg},
{"sh", "-c", fmt.Sprintf("cat yarn.lock %s > _pkg/yarn.lock", pkgYarnLock)},
{"yarn", "--cwd", "_pkg", "install", "--prod", "--frozen-lockfile"},
{"tar", "cf", result, fmt.Sprintf("--use-compress-program=%v", compressor), "-C", "_pkg", "."},
{"tar", "--sparse", "-cf", result, fmt.Sprintf("--use-compress-program=%v", compressor), "-C", "_pkg", "."},
}...)
resultDir = "_pkg"
} else if cfg.Packaging == YarnArchive {
pkgCommands = append(pkgCommands, []string{"tar", "cf", result, fmt.Sprintf("--use-compress-program=%v", compressor), "."})
pkgCommands = append(pkgCommands, []string{"tar", "--sparse", "-cf", result, fmt.Sprintf("--use-compress-program=%v", compressor), "."})
} else {
return nil, xerrors.Errorf("unknown Yarn packaging: %s", cfg.Packaging)
}
Expand Down Expand Up @@ -1299,7 +1299,7 @@ func (p *Package) buildGo(buildctx *buildContext, wd, result string) (res *packa

commands[PackageBuildPhasePackage] = append(commands[PackageBuildPhasePackage], []string{"rm", "-rf", "_deps"})
commands[PackageBuildPhasePackage] = append(commands[PackageBuildPhasePackage], []string{
"tar", "cf", result, fmt.Sprintf("--use-compress-program=%v", compressor), ".",
"tar", "--sparse", "-cf", result, fmt.Sprintf("--use-compress-program=%v", compressor), ".",
})
if !cfg.DontTest && !buildctx.DontTest {
commands[PackageBuildPhasePackage] = append(commands[PackageBuildPhasePackage], [][]string{
Expand Down Expand Up @@ -1396,7 +1396,7 @@ func (p *Package) buildDocker(buildctx *buildContext, wd, result string) (res *p
tgt := p.BuildLayoutLocation(dep)
commands[PackageBuildPhasePrep] = append(commands[PackageBuildPhasePrep], [][]string{
{"mkdir", tgt},
{"tar", "xfz", fn, "--no-same-owner", "-C", tgt},
{"tar", "--sparse", "-xzf", fn, "--no-same-owner", "-C", tgt},
}...)

if dep.Type != DockerPackage {
Expand Down Expand Up @@ -1486,7 +1486,7 @@ func (p *Package) buildDocker(buildctx *buildContext, wd, result string) (res *p
}
pkgCommands = append(pkgCommands, []string{"sh", "-c", fmt.Sprintf("echo %s | base64 -d > %s", base64.StdEncoding.EncodeToString(consts), dockerMetadataFile)})

archiveCmd := []string{"tar", "cf", result, fmt.Sprintf("--use-compress-program=%v", compressor), "./" + dockerImageNamesFiles, "./" + dockerMetadataFile}
archiveCmd := []string{"tar", "--sparse", "-cf", result, fmt.Sprintf("--use-compress-program=%v", compressor), "./" + dockerImageNamesFiles, "./" + dockerMetadataFile}
if p.C.W.Provenance.Enabled {
archiveCmd = append(archiveCmd, "./"+provenanceBundleFilename)
}
Expand Down Expand Up @@ -1648,7 +1648,7 @@ func (p *Package) buildGeneric(buildctx *buildContext, wd, result string) (res *
log.WithField("package", p.FullName()).Debug("package has no commands nor test - creating empty tar")

compressArg := getCompressionArg(buildctx)
tarArgs := []string{"cf", result}
tarArgs := []string{"--sparse", "-cf", result}
if compressArg != "" {
tarArgs = append(tarArgs, compressArg)
}
Expand Down Expand Up @@ -1681,7 +1681,7 @@ func (p *Package) buildGeneric(buildctx *buildContext, wd, result string) (res *
tgt := p.BuildLayoutLocation(dep)
commands = append(commands, [][]string{
{"mkdir", tgt},
{"tar", "xfz", fn, "--no-same-owner", "-C", tgt},
{"tar", "--sparse", "-xzf", fn, "--no-same-owner", "-C", tgt},
}...)
}

Expand All @@ -1692,7 +1692,7 @@ func (p *Package) buildGeneric(buildctx *buildContext, wd, result string) (res *
}

compressArg := getCompressionArg(buildctx)
tarArgs := []string{"cf", result}
tarArgs := []string{"--sparse", "-cf", result}
if compressArg != "" {
tarArgs = append(tarArgs, compressArg)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/leeway/scripts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ func (p *Script) synthesizePackagesWorkdir(buildCtx *buildContext) (path string,
}

var out []byte
cmd := exec.Command("tar", "xzf", br)
cmd := exec.Command("tar", "--sparse", "-xzf", br)
cmd.Dir = loc
out, err = cmd.CombinedOutput()
if err != nil {
Expand Down
Loading