-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
25 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,9 @@ | ||
moby-buildx (0.12.0-1) UNRELEASED; urgency=medium | ||
|
||
* Update to 0.12.0 | ||
|
||
-- Tianon Gravi <[email protected]> Wed, 29 Nov 2023 10:09:12 -0800 | ||
|
||
moby-buildx (0.11.2-1) unstable; urgency=medium | ||
|
||
* Update to 0.11.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,38 +2,24 @@ Description: require explicit opt-in for "tty" progress mode | |
Author: Tianon Gravi <[email protected]> | ||
Applied-Upstream: nack | ||
|
||
diff --git a/util/progress/printer.go b/util/progress/printer.go | ||
index fdc74d91..c6721730 100644 | ||
--- a/util/progress/printer.go | ||
+++ b/util/progress/printer.go | ||
@@ -103,7 +103,7 @@ func NewPrinter(ctx context.Context, w io.Writer, out console.File, mode string, | ||
diff --git a/vendor/github.com/moby/buildkit/util/progress/progressui/display.go b/vendor/github.com/moby/buildkit/util/progress/progressui/display.go | ||
index 01548229..04d41f84 100644 | ||
--- a/vendor/github.com/moby/buildkit/util/progress/progressui/display.go | ||
+++ b/vendor/github.com/moby/buildkit/util/progress/progressui/display.go | ||
@@ -145,14 +145,14 @@ const ( | ||
// For TtyMode to work, the io.Writer should also implement console.File. | ||
func NewDisplay(out io.Writer, mode DisplayMode, opts ...DisplayOpt) (Display, error) { | ||
switch mode { | ||
case PrinterModeQuiet: | ||
w = io.Discard | ||
- case PrinterModeAuto, PrinterModeTty: | ||
+ case PrinterModeTty: | ||
if cons, err := console.ConsoleFromFile(out); err == nil { | ||
c = cons | ||
} else { | ||
diff --git a/vendor/github.com/moby/buildkit/util/progress/progresswriter/printer.go b/vendor/github.com/moby/buildkit/util/progress/progresswriter/printer.go | ||
index c400e412..7f47de46 100644 | ||
--- a/vendor/github.com/moby/buildkit/util/progress/progresswriter/printer.go | ||
+++ b/vendor/github.com/moby/buildkit/util/progress/progresswriter/printer.go | ||
@@ -72,7 +72,7 @@ func NewPrinter(ctx context.Context, out console.File, mode string) (Writer, err | ||
|
||
var c console.Console | ||
switch mode { | ||
- case "auto", "tty", "": | ||
+ case "tty": | ||
if cons, err := console.ConsoleFromFile(out); err == nil { | ||
c = cons | ||
} else { | ||
@@ -80,7 +80,7 @@ func NewPrinter(ctx context.Context, out console.File, mode string) (Writer, err | ||
return nil, errors.Wrap(err, "failed to get console") | ||
} | ||
- case AutoMode, TtyMode, DefaultMode: | ||
+ case TtyMode: | ||
if c, err := consoleFromWriter(out); err == nil { | ||
return newConsoleDisplay(c, opts...), nil | ||
} else if mode == "tty" { | ||
return Display{}, errors.Wrap(err, "failed to get console") | ||
} | ||
- case "plain": | ||
+ case "plain", "auto", "": | ||
default: | ||
return nil, errors.Errorf("invalid progress mode %s", mode) | ||
} | ||
fallthrough | ||
- case PlainMode: | ||
+ case PlainMode, AutoMode, DefaultMode: | ||
return newPlainDisplay(out, opts...), nil | ||
case RawJSONMode: | ||
return newRawJSONDisplay(out, opts...), nil |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters