Skip to content

Commit

Permalink
Update to go 1.21, update to Docker client v24.0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobwgillespie committed Mar 6, 2024
1 parent 76cb17e commit b0c63e3
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.20.5"
go-version: "1.21"
check-latest: true
cache: true

Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.20.5"
go-version: "1.21"
check-latest: true
cache: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: "1.20.5"
go-version: "1.21"
check-latest: true
cache: true

Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
run:
go: "1.20"
go: "1.21"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.20.11 AS build
FROM --platform=$BUILDPLATFORM golang:1.21 AS build
WORKDIR /src
ARG LDFLAGS
ARG TARGETARCH
Expand Down
2 changes: 1 addition & 1 deletion examples/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/depot/cli/examples

go 1.20
go 1.21

require (
github.com/depot/cli v1.8.3
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/depot/cli

go 1.20
go 1.21

require (
buf.build/gen/go/depot/api/connectrpc/go v1.15.0-20240221184445-e8316610338f.1
Expand Down Expand Up @@ -190,6 +190,7 @@ require (
)

replace (
github.com/docker/docker => github.com/docker/docker v24.0.9+incompatible
github.com/moby/buildkit => github.com/depot/buildkit v0.11.6-depot.34
k8s.io/api => k8s.io/api v0.22.4
k8s.io/apimachinery => k8s.io/apimachinery v0.22.4
Expand Down
49 changes: 47 additions & 2 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/cmd/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func NewCmdConfigureDocker(dockerCli command.Cli) *cobra.Command {
return cmd
}

func installDepotPlugin(dir, self string) error {
func installDepotPlugin(_, self string) error {
if err := os.MkdirAll(path.Join(config.Dir(), "cli-plugins"), 0755); err != nil {
return errors.Wrap(err, "could not create cli-plugins directory")
}
Expand Down

0 comments on commit b0c63e3

Please sign in to comment.