opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

new showrun() for displaying and running shell commands

Browse Source 
Equivalent to print() + system(). Shows individual commands
being run, which may help a developer understand and replicate
actions if they fail.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2024-10-22 12:43:52 -06:00
parent 9db04e87b6
commit 825eed4bde
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
hack/buildah-vendor-treadmill
View File

@ -41,12 +41,14 @@ our $API_URL = 'https://api.github.com/graphql';
# Use colors if available and if stdout is a tty # Use colors if available and if stdout is a tty
our $C_Highlight = ''; our $C_Highlight = '';
our $C_Warning = ''; our $C_Warning = '';
our $C_LogCmd = '';
our $C_Reset = ''; our $C_Reset = '';
eval ' eval '
use Term::ANSIColor; use Term::ANSIColor;
if (-t 1) { if (-t 1) {
$C_Highlight = color("green"); $C_Highlight = color("green");
$C_Warning = color("bold red"); $C_Warning = color("bold red");
$C_LogCmd = color("blue");
$C_Reset = color("reset"); $C_Reset = color("reset");
} }
@ -234,9 +236,9 @@ END_FAIL_INSTRUCTIONS
# This does have a high possibility of failing. # This does have a high possibility of failing.
progress("Vendoring in buildah..."); progress("Vendoring in buildah...");
system('go', 'mod', 'edit', '--require' => "${Buildah}\@main") == 0 showrun('go', 'mod', 'edit', '--require' => "${Buildah}\@main") == 0
or die "$ME: go mod edit failed"; or die "$ME: go mod edit failed";
system('make', 'vendor') == 0 showrun('make', 'vendor') == 0
or die "$ME: make vendor failed"; or die "$ME: make vendor failed";
my $buildah_new = vendored_buildah(); my $buildah_new = vendored_buildah();
print "-> buildah new = $buildah_new\n"; print "-> buildah new = $buildah_new\n";
@ -418,7 +420,7 @@ sub build_and_check_podman {
# Confirm that we can still build podman # Confirm that we can still build podman
progress("Running 'make' to confirm that podman builds cleanly..."); progress("Running 'make' to confirm that podman builds cleanly...");
system('make') == 0 showrun('make') == 0
or die "$ME: 'make' failed with new buildah. Cannot continue.\n"; or die "$ME: 'make' failed with new buildah. Cannot continue.\n";
# See if any new options need man pages. (C_Warning will highlight errs) # See if any new options need man pages. (C_Warning will highlight errs)
@ -431,14 +433,14 @@ sub build_and_check_podman {
# the name of the directory created by the bud-tests script. # the name of the directory created by the bud-tests script.
progress("Confirming that buildah-bud-tests patches still apply..."); progress("Confirming that buildah-bud-tests patches still apply...");
system('rm -rf test-buildah-*'); system('rm -rf test-buildah-*');
if (system('test/buildah-bud/run-buildah-bud-tests', '--no-test')) { if (showrun('test/buildah-bud/run-buildah-bud-tests', '--no-test')) {
# Error # Error
++$errs; ++$errs;
warn "$ME: Leaving test-buildah- directory for you to investigate\n"; warn "$ME: Leaving test-buildah- directory for you to investigate\n";
} }
else { else {
# Patches apply cleanly. Clean up # Patches apply cleanly. Clean up
system('rm -rf test-buildah-*'); showrun('rm -rf test-buildah-*');
} }
return if !$errs; return if !$errs;
@ -894,6 +896,14 @@ sub git {
return wantarray ? @results : join("\n", @results); return wantarray ? @results : join("\n", @results);
} }
#############
# showrun # Given a command, print it then run it. Return value is system()
#############
sub showrun {
print "\$ ${C_LogCmd}@_${C_Reset}\n";
system(@_);
}
################################## ##################################
# assert_buildah_vendor_commit # Fails if input arg is not a buildah vendor # assert_buildah_vendor_commit # Fails if input arg is not a buildah vendor
################################## ##################################