Skip to content

Commit a264ed7

Browse files
committed
Update dependencies and Go to v1.19
1 parent cdca1a1 commit a264ed7

File tree

5 files changed

+94
-1739
lines changed

5 files changed

+94
-1739
lines changed

.github/workflows/build.yaml

Lines changed: 8 additions & 9 deletions
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.17.5'
18+
go-version: '1.19'
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.17.5'
36+
go-version: '1.19'
3737
- name: Restore go build cache
3838
uses: actions/cache@v1
3939
with:
@@ -52,11 +52,10 @@ jobs:
5252
- name: Setup Golang
5353
uses: actions/setup-go@v3
5454
with:
55-
go-version: '1.17.5'
55+
go-version: '1.19'
5656
- name: Run golangci-lint
57-
uses: golangci/golangci-lint-action@v3.1.0
57+
uses: golangci/golangci-lint-action@v3
5858
with:
59-
version: v1.45.2
6059
args: --timeout 5m
6160

6261
test-go:
@@ -77,7 +76,7 @@ jobs:
7776
- name: Setup Golang
7877
uses: actions/setup-go@v3
7978
with:
80-
go-version: '1.17.5'
79+
go-version: '1.19'
8180
- name: Restore go build cache
8281
uses: actions/cache@v1
8382
with:
@@ -90,12 +89,12 @@ jobs:
9089
run: pushd pkg/test/runner; ./build.sh; popd
9190
- name: Install the latest buildkit release
9291
run: |
93-
curl -sSL "https://github.com/moby/buildkit/releases/download/v0.10.1/buildkit-v0.10.1.linux-amd64.tar.gz" | sudo tar -xz -C /usr/local
92+
curl -sSL "https://github.com/moby/buildkit/releases/download/v0.10.3/buildkit-v0.10.3.linux-amd64.tar.gz" | sudo tar -xz -C /usr/local
9493
- name: Start buildkit daemon
9594
run: |
9695
sudo --non-interactive --shell <<END_SUDO
9796
install -d -m 0750 -o root -g docker /run/buildkit
98-
buildkitd --oci-worker-snapshotter=stargz &
97+
buildkitd &
9998
while ! test -S /run/buildkit/buildkitd.sock; do sleep 0.1; done
10099
chgrp docker /run/buildkit/buildkitd.sock
101100
END_SUDO
@@ -121,7 +120,7 @@ jobs:
121120
- name: Setup Golang
122121
uses: actions/setup-go@v3
123122
with:
124-
go-version: '1.17.5'
123+
go-version: '1.19'
125124
- name: Restore go build cache
126125
uses: actions/cache@v1
127126
with:

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
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.17.5'
21+
go-version: '1.19'
2222
-
2323
name: Docker Login
2424
uses: docker/login-action@v1

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM moby/buildkit:v0.10.1
1+
FROM moby/buildkit:v0.10.3
22
WORKDIR /dazzle
33
COPY dazzle README.md /dazzle/
44
ENV PATH=/dazzle:$PATH

go.mod

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
11
module github.com/gitpod-io/dazzle
22

3-
go 1.17
3+
go 1.19
44

55
require (
66
github.com/GeertJohan/go.rice v1.0.2
77
github.com/alecthomas/jsonschema v0.0.0-20220216202328-9eeeec9d044b
8-
github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae
8+
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.3-0.20220401172941-5ff8fce1fcc6
12-
github.com/creack/pty v1.1.17
13-
github.com/docker/cli v20.10.13+incompatible
11+
github.com/containerd/containerd v1.6.8
12+
github.com/creack/pty v1.1.18
13+
github.com/docker/cli v20.10.17+incompatible
1414
github.com/docker/distribution v2.8.1+incompatible
15-
github.com/google/go-cmp v0.5.7
16-
github.com/gookit/color v1.5.0
15+
github.com/google/go-cmp v0.5.8
16+
github.com/gookit/color v1.5.1
1717
github.com/manifoldco/promptui v0.9.0
18-
github.com/mattn/go-isatty v0.0.14
18+
github.com/mattn/go-isatty v0.0.16
1919
github.com/minio/highwayhash v1.0.2
20-
github.com/moby/buildkit v0.10.1
20+
github.com/moby/buildkit v0.10.3
2121
github.com/opencontainers/go-digest v1.0.0
2222
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
2323
github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f
2424
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
25-
github.com/sirupsen/logrus v1.8.1
26-
github.com/spf13/cobra v1.4.0
27-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
25+
github.com/sirupsen/logrus v1.9.0
26+
github.com/spf13/cobra v1.5.0
27+
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
2828
gopkg.in/yaml.v2 v2.4.0
2929
)
3030

3131
require (
32-
cloud.google.com/go v0.81.0 // indirect
33-
github.com/Microsoft/go-winio v0.5.1 // indirect
32+
github.com/Microsoft/go-winio v0.5.2 // indirect
3433
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
35-
github.com/containerd/continuity v0.2.3-0.20220330195504-d132b287edc8 // indirect
34+
github.com/containerd/continuity v0.3.0 // indirect
3635
github.com/containerd/typeurl v1.0.2 // indirect
3736
github.com/daaku/go.zipexe v1.0.0 // indirect
38-
github.com/docker/docker v20.10.7+incompatible // indirect
37+
github.com/docker/docker v20.10.17+incompatible // indirect
3938
github.com/docker/docker-credential-helpers v0.6.4 // indirect
4039
github.com/go-logr/logr v1.2.2 // indirect
4140
github.com/go-logr/stdr v1.2.2 // indirect
@@ -48,14 +47,13 @@ require (
4847
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
4948
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
5049
github.com/inconshreveable/mousetrap v1.0.0 // indirect
51-
github.com/klauspost/compress v1.15.1 // indirect
52-
github.com/kr/text v0.2.0 // indirect
50+
github.com/klauspost/compress v1.15.7 // indirect
5351
github.com/moby/locker v1.0.1 // indirect
5452
github.com/moby/sys/signal v0.6.0 // indirect
5553
github.com/morikuni/aec v1.0.0 // indirect
5654
github.com/pkg/errors v0.9.1 // indirect
5755
github.com/spf13/pflag v1.0.5 // indirect
58-
github.com/tonistiigi/fsutil v0.0.0-20220115021204-b19f7f9cb274 // indirect
56+
github.com/tonistiigi/fsutil v0.0.0-20220510150904-0dbf3a8a7d58 // indirect
5957
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
6058
github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect
6159
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
@@ -65,21 +63,15 @@ require (
6563
go.opentelemetry.io/otel/sdk v1.4.1 // indirect
6664
go.opentelemetry.io/otel/trace v1.4.1 // indirect
6765
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
68-
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect
69-
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
70-
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
66+
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
67+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
68+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
7169
golang.org/x/text v0.3.7 // indirect
72-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
73-
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
74-
google.golang.org/grpc v1.45.0 // indirect
70+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
71+
google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 // indirect
72+
google.golang.org/grpc v1.47.0 // indirect
7573
google.golang.org/protobuf v1.27.1 // indirect
76-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
7774
gopkg.in/sourcemap.v1 v1.0.5 // indirect
7875
)
7976

80-
replace (
81-
github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.8.1
82-
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20211208011758-87521affb077+incompatible // master (v21.xx-dev)
83-
github.com/tonistiigi/fsutil => github.com/tonistiigi/fsutil v0.0.0-20220115021204-b19f7f9cb274
84-
85-
)
77+
replace github.com/tonistiigi/fsutil => github.com/jetpack-io/fsutil v0.1.2

0 commit comments

Comments
 (0)