Skip to content

Commit a2b54c8

Browse files
kylos101kylos101
committed
Update dep
* buildkit to v0.12.1 * go to 1.20 * `build.go` the signature for `progressui.DisplaySolveStatus` changed * `combiner.go` Architecture and OS were removed from the image spec
1 parent b607dc3 commit a2b54c8

File tree

8 files changed

+376
-98
lines changed

8 files changed

+376
-98
lines changed

Diff for: ‎.github/workflows/build.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup Golang
1616
uses: actions/setup-go@v3
1717
with:
18-
go-version: '1.19'
18+
go-version: '1.20'
1919
- name: Download all Go modules
2020
run: |
2121
go mod download
@@ -33,7 +33,7 @@ jobs:
3333
- name: Setup Golang
3434
uses: actions/setup-go@v3
3535
with:
36-
go-version: '1.19'
36+
go-version: '1.20'
3737
- name: Restore go build cache
3838
uses: actions/cache@v1
3939
with:
@@ -52,7 +52,7 @@ jobs:
5252
- name: Setup Golang
5353
uses: actions/setup-go@v3
5454
with:
55-
go-version: '1.19'
55+
go-version: '1.20'
5656
- name: Run golangci-lint
5757
uses: golangci/golangci-lint-action@v3
5858
with:
@@ -76,7 +76,7 @@ jobs:
7676
- name: Setup Golang
7777
uses: actions/setup-go@v3
7878
with:
79-
go-version: '1.19'
79+
go-version: '1.20'
8080
- name: Restore go build cache
8181
uses: actions/cache@v1
8282
with:
@@ -89,7 +89,7 @@ jobs:
8989
run: pushd pkg/test/runner; ./build.sh; popd
9090
- name: Install the latest buildkit release
9191
run: |
92-
curl -sSL "https://github.com/moby/buildkit/releases/download/v0.11.2/buildkit-v0.11.2.linux-amd64.tar.gz" | sudo tar -xz -C /usr/local
92+
curl -sSL "https://github.com/moby/buildkit/releases/download/v0.12.1/buildkit-v0.12.1.linux-amd64.tar.gz" | sudo tar -xz -C /usr/local
9393
- name: Start buildkit daemon
9494
run: |
9595
sudo --non-interactive --shell <<END_SUDO
@@ -120,7 +120,7 @@ jobs:
120120
- name: Setup Golang
121121
uses: actions/setup-go@v3
122122
with:
123-
go-version: '1.19'
123+
go-version: '1.20'
124124
- name: Restore go build cache
125125
uses: actions/cache@v1
126126
with:

Diff for: ‎.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: Setup Golang
1919
uses: actions/setup-go@v3
2020
with:
21-
go-version: '1.19'
21+
go-version: '1.20'
2222
-
2323
name: Docker Login
2424
uses: docker/login-action@v1

Diff for: ‎.gitpod.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM gitpod/workspace-full
22

33
USER root
4-
ENV TRIGGER_REBUILD=2
4+
ENV TRIGGER_REBUILD=3
55
RUN echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | sudo tee /etc/apt/sources.list.d/goreleaser.list \
66
&& install-packages goreleaser -y
7-
RUN sudo su -c "cd /usr; curl -L https://github.com/moby/buildkit/releases/download/v0.11.2/buildkit-v0.11.2.linux-amd64.tar.gz | tar xvz"
7+
RUN sudo su -c "cd /usr; curl -L https://github.com/moby/buildkit/releases/download/v0.12.1/buildkit-v0.12.1.linux-amd64.tar.gz | tar xvz"
88
# NOTE: remove when workspace-full includes golangci
99
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo BINDIR=/usr/local/bin sh
1010

Diff for: ‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM moby/buildkit:v0.11.2
1+
FROM moby/buildkit:v0.12.1
22
WORKDIR /dazzle
33
COPY dazzle README.md /dazzle/
44
ENV PATH=/dazzle:$PATH

Diff for: ‎go.mod

+26-20
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
module github.com/gitpod-io/dazzle
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/GeertJohan/go.rice v1.0.3
77
github.com/alecthomas/jsonschema v0.0.0-20220216202328-9eeeec9d044b
88
github.com/alecthomas/repr v0.1.0
99
github.com/bmatcuk/doublestar v1.3.4
1010
github.com/containerd/console v1.0.3
11-
github.com/containerd/containerd v1.6.20
11+
github.com/containerd/containerd v1.7.2
1212
github.com/creack/pty v1.1.18
13-
github.com/docker/cli v23.0.0-rc.3+incompatible
13+
github.com/docker/cli v24.0.4+incompatible
1414
github.com/docker/distribution v2.8.2+incompatible
1515
github.com/google/go-cmp v0.5.9
1616
github.com/gookit/color v1.5.1
1717
github.com/manifoldco/promptui v0.9.0
1818
github.com/mattn/go-isatty v0.0.16
1919
github.com/minio/highwayhash v1.0.2
20-
github.com/moby/buildkit v0.11.6
20+
github.com/moby/buildkit v0.12.1
2121
github.com/opencontainers/go-digest v1.0.0
22-
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
22+
github.com/opencontainers/image-spec v1.1.0-rc3
2323
github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f
2424
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
2525
github.com/sirupsen/logrus v1.9.0
@@ -29,12 +29,14 @@ require (
2929
)
3030

3131
require (
32-
github.com/Microsoft/go-winio v0.5.2 // indirect
32+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
33+
github.com/Microsoft/go-winio v0.6.1 // indirect
3334
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
34-
github.com/containerd/continuity v0.3.0 // indirect
35-
github.com/containerd/typeurl v1.0.2 // indirect
35+
github.com/containerd/continuity v0.4.1 // indirect
36+
github.com/containerd/typeurl/v2 v2.1.1 // indirect
37+
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
3638
github.com/daaku/go.zipexe v1.0.2 // indirect
37-
github.com/docker/docker v23.0.0-rc.1+incompatible // indirect
39+
github.com/docker/docker v24.0.0-rc.2.0.20230718135204-8e51b8b59cb8+incompatible // indirect
3840
github.com/docker/docker-credential-helpers v0.7.0 // indirect
3941
github.com/go-logr/logr v1.2.3 // indirect
4042
github.com/go-logr/stdr v1.2.2 // indirect
@@ -44,10 +46,10 @@ require (
4446
github.com/golang/protobuf v1.5.3 // indirect
4547
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
4648
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
47-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
49+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
4850
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
4951
github.com/inconshreveable/mousetrap v1.0.0 // indirect
50-
github.com/klauspost/compress v1.15.12 // indirect
52+
github.com/klauspost/compress v1.16.3 // indirect
5153
github.com/kr/text v0.2.0 // indirect
5254
github.com/moby/locker v1.0.1 // indirect
5355
github.com/moby/patternmatcher v0.5.0 // indirect
@@ -56,24 +58,28 @@ require (
5658
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
5759
github.com/pkg/errors v0.9.1 // indirect
5860
github.com/spf13/pflag v1.0.5 // indirect
59-
github.com/tonistiigi/fsutil v0.0.0-20230105215944-fb433841cbfa // indirect
61+
github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb // indirect
6062
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
61-
github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect
63+
github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531 // indirect
6264
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
63-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect
64-
go.opentelemetry.io/otel v1.4.1 // indirect
65-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1 // indirect
66-
go.opentelemetry.io/otel/sdk v1.4.1 // indirect
67-
go.opentelemetry.io/otel/trace v1.4.1 // indirect
68-
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
65+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
66+
go.opentelemetry.io/otel v1.14.0 // indirect
67+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
68+
go.opentelemetry.io/otel/metric v0.37.0 // indirect
69+
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
70+
go.opentelemetry.io/otel/trace v1.14.0 // indirect
71+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
6972
golang.org/x/crypto v0.14.0 // indirect
73+
golang.org/x/mod v0.9.0 // indirect
7074
golang.org/x/net v0.17.0 // indirect
7175
golang.org/x/sys v0.13.0 // indirect
7276
golang.org/x/text v0.13.0 // indirect
73-
golang.org/x/time v0.1.0 // indirect
77+
golang.org/x/time v0.3.0 // indirect
78+
golang.org/x/tools v0.7.0 // indirect
7479
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
7580
google.golang.org/grpc v1.56.3 // indirect
7681
google.golang.org/protobuf v1.30.0 // indirect
7782
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
7883
gopkg.in/sourcemap.v1 v1.0.5 // indirect
84+
gotest.tools/v3 v3.5.0 // indirect
7985
)

0 commit comments

Comments
 (0)