Skip to content

Commit da0bae7

Browse files
maxmcdmaxmcd
committed
pull out reptar
1 parent e23534c commit da0bae7

File tree

14 files changed

+15
-614
lines changed

14 files changed

+15
-614
lines changed

‎cmd/replacer/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"io/ioutil"
77
"os"
88

9-
"github.com/maxmcd/bramble/pkg/reptar"
109
"github.com/maxmcd/bramble/pkg/textreplace"
10+
"github.com/maxmcd/reptar"
1111
"github.com/mholt/archiver/v3"
1212
)
1313

‎cmd/reptar/main.go

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ require (
1010
github.com/charmbracelet/lipgloss v0.4.0
1111
github.com/containerd/console v1.0.3
1212
github.com/julienschmidt/httprouter v1.3.0
13-
github.com/klauspost/pgzip v1.2.4
13+
github.com/klauspost/pgzip v1.2.5
1414
github.com/maxmcd/dag v0.0.0-20210909010249-5757e2034a95
15+
github.com/maxmcd/reptar v0.0.0-20220507012129-b7cb8d03dbe9
1516
github.com/mholt/archiver/v3 v3.5.0
1617
github.com/minio/sha256-simd v1.0.0
1718
github.com/mitchellh/go-wordwrap v1.0.1
@@ -31,7 +32,6 @@ require (
3132
golang.org/x/mod v0.4.2
3233
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
3334
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac
34-
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11
3535
gotest.tools/v3 v3.0.3 // indirect
3636
)
3737

‎go.sum

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ github.com/klauspost/cpuid v1.2.0 h1:NMpwD2G9JSFOE1/TJjGSo5zG7Yb2bTe7eq1jH+irmeE
8989
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
9090
github.com/klauspost/cpuid/v2 v2.0.4 h1:g0I61F2K2DjRHz1cnxlkNSBIaePVoJIjjnHui8QHbiw=
9191
github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
92-
github.com/klauspost/pgzip v1.2.4 h1:TQ7CNpYKovDOmqzRHKxJh0BeaBI7UdQZYc6p7pMQh1A=
9392
github.com/klauspost/pgzip v1.2.4/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
93+
github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE=
94+
github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
9495
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
9596
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
9697
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
@@ -111,6 +112,8 @@ github.com/maxmcd/archiver/v3 v3.3.2-0.20210923004632-06ef4f8f175b h1:Z+y8sx28U7
111112
github.com/maxmcd/archiver/v3 v3.3.2-0.20210923004632-06ef4f8f175b/go.mod h1:2X2ALNbjYXnVYbkESAzRbpja4i0m4VNuFUQT7F69X/I=
112113
github.com/maxmcd/dag v0.0.0-20210909010249-5757e2034a95 h1:tBGx3z+FLew3L1BOuklkzm2UEIBcOZCgFa58VcJR9xk=
113114
github.com/maxmcd/dag v0.0.0-20210909010249-5757e2034a95/go.mod h1:pYGWUsNzYvkcdAOr2py4zGskjw/wdqSGUUwi8jwcikk=
115+
github.com/maxmcd/reptar v0.0.0-20220507012129-b7cb8d03dbe9 h1:0Pj51hoeko8PuOlkLdNvhLBClYTomOm76gZHCCpxvUY=
116+
github.com/maxmcd/reptar v0.0.0-20220507012129-b7cb8d03dbe9/go.mod h1:GPjLc3cTgkXFhW5v7bq6ejs6ELsj/ukIL4pR2bLW/Tc=
114117
github.com/maxmcd/starlark-go v0.0.0-20201021154825-b2f805d0d122 h1:5ntUQ6qQLi3wcHdxEVWud2Q5z11Pj6cQFA6OHbCvbRU=
115118
github.com/maxmcd/starlark-go v0.0.0-20201021154825-b2f805d0d122/go.mod h1:f0znQkUKRrkk36XxWbGjMqQM8wGv/xHBVE2qc3B5oFU=
116119
github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
@@ -249,8 +252,8 @@ golang.org/x/term v0.0.0-20210422114643-f5beecf764ed h1:Ei4bQjjpYUsS4efOUz+5Nz++
249252
golang.org/x/term v0.0.0-20210422114643-f5beecf764ed/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
250253
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
251254
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
252-
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 h1:GZokNIeuVkl3aZHJchRrr13WCsols02MLUcz1U9is6M=
253-
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
255+
golang.org/x/time v0.0.0-20220411224347-583f2d630306 h1:+gHMid33q6pen7kv9xvT+JRinntgeXO2AeZVd0AWD3w=
256+
golang.org/x/time v0.0.0-20220411224347-583f2d630306/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
254257
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
255258
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
256259
golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=

‎internal/dependency/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/maxmcd/bramble/internal/netcache"
1515
"github.com/maxmcd/bramble/internal/types"
1616
"github.com/maxmcd/bramble/pkg/httpx"
17-
"github.com/maxmcd/bramble/pkg/reptar"
17+
"github.com/maxmcd/reptar"
1818
"github.com/pkg/errors"
1919
)
2020

‎internal/dependency/dependency.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/maxmcd/bramble/internal/types"
2020
"github.com/maxmcd/bramble/pkg/fileutil"
2121
"github.com/maxmcd/bramble/pkg/httpx"
22-
"github.com/maxmcd/bramble/pkg/reptar"
2322
"github.com/maxmcd/bramble/v/cmd/go/mvs"
23+
"github.com/maxmcd/reptar"
2424
"github.com/pkg/errors"
2525
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
2626
"golang.org/x/mod/semver"

‎internal/store/builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"github.com/maxmcd/bramble/internal/types"
2222
"github.com/maxmcd/bramble/pkg/fileutil"
2323
"github.com/maxmcd/bramble/pkg/hasher"
24-
"github.com/maxmcd/bramble/pkg/reptar"
2524
"github.com/maxmcd/bramble/pkg/sandbox"
2625
"github.com/maxmcd/bramble/pkg/textreplace"
26+
"github.com/maxmcd/reptar"
2727
"github.com/mholt/archiver/v3"
2828
"github.com/pkg/errors"
2929
"go.opentelemetry.io/otel/attribute"

‎internal/store/new_derivation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/maxmcd/bramble/pkg/fileutil"
99
"github.com/maxmcd/bramble/pkg/hasher"
10-
"github.com/maxmcd/bramble/pkg/reptar"
10+
"github.com/maxmcd/reptar"
1111
"github.com/pkg/errors"
1212
)
1313

‎internal/store/package_cache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/maxmcd/bramble/internal/netcache"
1313
"github.com/maxmcd/bramble/pkg/fileutil"
1414
"github.com/maxmcd/bramble/pkg/httpx"
15-
"github.com/maxmcd/bramble/pkg/reptar"
15+
"github.com/maxmcd/reptar"
1616
"github.com/pkg/errors"
1717
)
1818

‎internal/store/store.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"github.com/maxmcd/bramble/internal/tracing"
1515
"github.com/maxmcd/bramble/pkg/fileutil"
1616
"github.com/maxmcd/bramble/pkg/hasher"
17-
"github.com/maxmcd/bramble/pkg/reptar"
1817
"github.com/maxmcd/bramble/pkg/sandbox"
18+
"github.com/maxmcd/reptar"
1919
"github.com/pkg/errors"
2020
"go.opentelemetry.io/otel/trace"
2121
"golang.org/x/sync/errgroup"

‎pkg/reptar/readme.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎pkg/reptar/reptar.go

Lines changed: 0 additions & 195 deletions
This file was deleted.

0 commit comments

Comments
 (0)