diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index 9bd42d5..1bfea6f 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -43,7 +43,17 @@ jobs: - name: Prepare schroot run: | - docker-image-to-sbuild-schroot --pull "$dist.tar" "debian:$dist" + img="debian:$dist" + docker pull "$img" + if [ "$dist" != 'unstable' ]; then + # add my personal backports (especially for newer Go versions) + wget -O tianon-backports.sources "https://apt.tianon.xyz/backports/dists/${dist%-backports}/tianon-backports.sources" + echo "FROM $img" > Dockerfile + echo 'COPY tianon-backports.sources /etc/apt/sources.list.d/' >> Dockerfile + img="tianon-backports:$dist" + docker build --tag "$img" . + fi + docker-image-to-sbuild-schroot "$dist.tar" "$img" - name: Prepare sbuild run: | diff --git a/moby-buildx/debian/changelog b/moby-buildx/debian/changelog index 98ce05b..fdd4a9f 100644 --- a/moby-buildx/debian/changelog +++ b/moby-buildx/debian/changelog @@ -1,9 +1,10 @@ -moby-buildx (0.10.5-1) UNRELEASED; urgency=medium +moby-buildx (0.11.0-1) UNRELEASED; urgency=medium - * Update to 0.10.5 + * Update to 0.11.0 + - update to Go 1.20 * Add patch to fix local image references on Docker's containerd integration - -- Tianon Gravi Tue, 06 Jun 2023 16:26:36 -0700 + -- Tianon Gravi Tue, 13 Jun 2023 17:03:10 -0700 moby-buildx (0.10.4-1) unstable; urgency=medium diff --git a/moby-buildx/debian/control b/moby-buildx/debian/control index 33a5ec1..d8a044e 100644 --- a/moby-buildx/debian/control +++ b/moby-buildx/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: Tianon Gravi Build-Depends: debhelper-compat (= 13), - golang-1.19-go | golang-go (>= 2:1.19~) | golang-any (>= 2:1.19~) + golang-1.20-go | golang-go (>= 2:1.20~) | golang-any (>= 2:1.20~) Rules-Requires-Root: no Homepage: https://github.com/docker/buildx Vcs-Browser: https://github.com/tianon/debian-moby diff --git a/moby-buildx/debian/patches/classic-plain-progress.patch b/moby-buildx/debian/patches/classic-plain-progress.patch index acfeb41..3555b3a 100644 --- a/moby-buildx/debian/patches/classic-plain-progress.patch +++ b/moby-buildx/debian/patches/classic-plain-progress.patch @@ -3,10 +3,10 @@ Author: Tianon Gravi Applied-Upstream: 👀 (no, but *might* be acceptable if it could be optional) 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 edbdaaa7..05aa13f0 100644 +index 4ceb4f52..7b1fde74 100644 --- a/vendor/github.com/moby/buildkit/util/progress/progressui/display.go +++ b/vendor/github.com/moby/buildkit/util/progress/progressui/display.go -@@ -542,9 +542,14 @@ func (t *trace) update(s *client.SolveStatus, termWidth int) { +@@ -568,9 +568,14 @@ func (t *trace) update(s *client.SolveStatus, termWidth int) { } i := 0 complete := split(l.Data, byte('\n'), func(dt []byte) { @@ -21,12 +21,25 @@ index edbdaaa7..05aa13f0 100644 ts := time.Duration(0) if ival := v.mostRecentInterval(); ival != nil { ts = l.Timestamp.Sub(*ival.start) -@@ -557,6 +562,8 @@ func (t *trace) update(s *client.SolveStatus, termWidth int) { +@@ -583,6 +588,8 @@ func (t *trace) update(s *client.SolveStatus, termWidth int) { prec = 2 } - v.logs = append(v.logs, []byte(fmt.Sprintf("#%d %s %s", v.index, fmt.Sprintf("%.[2]*[1]f", sec, prec), dt))) + v.logs = append(v.logs, []byte(fmt.Sprintf("%s %s", fmt.Sprintf("%.[2]*[1]f", sec, prec), dt))) + */ + v.logs = append(v.logs, dt) } i++ }) +diff --git a/vendor/github.com/moby/buildkit/util/progress/progressui/printer.go b/vendor/github.com/moby/buildkit/util/progress/progressui/printer.go +index 338079d4..432cdbe3 100644 +--- a/vendor/github.com/moby/buildkit/util/progress/progressui/printer.go ++++ b/vendor/github.com/moby/buildkit/util/progress/progressui/printer.go +@@ -147,7 +147,7 @@ func (p *textMux) printVtx(t *trace, dgst digest.Digest) { + l = l[v.logsOffset:] + fmt.Fprintf(p.w, "%s", l) + } else { +- fmt.Fprintf(p.w, "#%d %s", v.index, []byte(l)) ++ fmt.Fprintf(p.w, "%s", []byte(l)) + } + + if i != len(v.logs)-1 || !v.logsPartial { diff --git a/moby-buildx/debian/patches/default-plain-progress.patch b/moby-buildx/debian/patches/default-plain-progress.patch index fb3114a..015722b 100644 --- a/moby-buildx/debian/patches/default-plain-progress.patch +++ b/moby-buildx/debian/patches/default-plain-progress.patch @@ -3,10 +3,10 @@ Author: Tianon Gravi Applied-Upstream: nack diff --git a/util/progress/printer.go b/util/progress/printer.go -index 1247a7aa..40269e02 100644 +index fdc74d91..c6721730 100644 --- a/util/progress/printer.go +++ b/util/progress/printer.go -@@ -88,7 +88,7 @@ func NewPrinter(ctx context.Context, w io.Writer, out console.File, mode string) +@@ -103,7 +103,7 @@ func NewPrinter(ctx context.Context, w io.Writer, out console.File, mode string, switch mode { case PrinterModeQuiet: w = io.Discard @@ -16,7 +16,7 @@ index 1247a7aa..40269e02 100644 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 c96c4525..f7cc1f60 100644 +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 diff --git a/moby-buildx/debian/rules b/moby-buildx/debian/rules index d45c853..148b364 100755 --- a/moby-buildx/debian/rules +++ b/moby-buildx/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f -# prefer Go 1.19 -export PATH := /usr/lib/go-1.19/bin:$(PATH) +# prefer Go 1.20 +export PATH := /usr/lib/go-1.20/bin:$(PATH) # circumvent a few problematic (for Debian) Go features inspired by dh-golang export GOCACHE := $(CURDIR)/.gocache