From 3f782e1d672254f6ef6d0f58960726ccd58f5eb9 Mon Sep 17 00:00:00 2001 From: Jon Johnson Date: Sat, 1 Jul 2023 11:49:14 -0700 Subject: [PATCH] Switch from pargzip to pgzip Signed-off-by: Jon Johnson --- go.mod | 5 +++-- go.sum | 6 ++++-- pkg/build/build_implementation.go | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 736a5c73e..18275d367 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/hashicorp/go-multierror v1.1.1 github.com/jinzhu/copier v0.3.5 + github.com/klauspost/pgzip v1.2.5 github.com/maxbrunsfeld/counterfeiter/v6 v6.6.1 github.com/package-url/packageurl-go v0.1.1-0.20220203205134-d70459300c8a github.com/sigstore/cosign/v2 v2.1.1 @@ -22,7 +23,6 @@ require ( github.com/stretchr/testify v1.8.4 gitlab.alpinelinux.org/alpine/go v0.7.1-0.20230613043312-f696350aabb4 go.opentelemetry.io/otel v1.16.0 - golang.org/x/build v0.0.0-20220928220451-9294235e16f5 golang.org/x/sync v0.3.0 golang.org/x/sys v0.9.0 golang.org/x/term v0.9.0 @@ -100,7 +100,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect - github.com/klauspost/compress v1.16.5 // indirect + github.com/klauspost/compress v1.16.6 // indirect github.com/letsencrypt/boulder v0.0.0-20221109233200-85aa52084eaf // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect @@ -126,6 +126,7 @@ require ( go.mongodb.org/mongo-driver v1.11.3 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect + golang.org/x/build v0.0.0-20220928220451-9294235e16f5 // indirect golang.org/x/crypto v0.10.0 // indirect golang.org/x/mod v0.11.0 // indirect golang.org/x/net v0.11.0 // indirect diff --git a/go.sum b/go.sum index 836fa9139..d2758c546 100644 --- a/go.sum +++ b/go.sum @@ -281,8 +281,10 @@ github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= -github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk= +github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= +github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= diff --git a/pkg/build/build_implementation.go b/pkg/build/build_implementation.go index ac1722a50..09c85dfff 100644 --- a/pkg/build/build_implementation.go +++ b/pkg/build/build_implementation.go @@ -26,8 +26,8 @@ import ( "path/filepath" "runtime" + gzip "github.com/klauspost/pgzip" "go.opentelemetry.io/otel" - gzip "golang.org/x/build/pargzip" apkimpl "github.com/chainguard-dev/go-apk/pkg/apk" apkfs "github.com/chainguard-dev/go-apk/pkg/fs"