Skip to content

Commit 4e04787

Browse files
committed
Use pinned version of Go
1 parent 5dce698 commit 4e04787

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

.github/workflows/coder.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- uses: actions/checkout@v3
4141
- uses: actions/setup-go@v2
4242
with:
43-
go-version: "^1.17"
43+
go-version: "~1.17"
4444
- name: golangci-lint
4545
uses: golangci/golangci-lint-action@v3.1.0
4646
with:
@@ -82,7 +82,7 @@ jobs:
8282
version: "3.19.4"
8383
- uses: actions/setup-go@v2
8484
with:
85-
go-version: "^1.17"
85+
go-version: "~1.17"
8686
- run: curl -sSL
8787
https://github.com/kyleconroy/sqlc/releases/download/v1.11.0/sqlc_1.11.0_linux_amd64.tar.gz
8888
| sudo tar -C /usr/bin -xz sqlc
@@ -133,7 +133,7 @@ jobs:
133133

134134
- uses: actions/setup-go@v2
135135
with:
136-
go-version: "^1.17"
136+
go-version: "~1.17"
137137

138138
- name: Echo Go Cache Paths
139139
id: go-cache-paths
@@ -201,7 +201,7 @@ jobs:
201201

202202
- uses: actions/setup-go@v2
203203
with:
204-
go-version: "^1.17"
204+
go-version: "~1.17"
205205

206206
- name: Echo Go Cache Paths
207207
id: go-cache-paths
@@ -299,7 +299,7 @@ jobs:
299299

300300
- uses: actions/setup-go@v2
301301
with:
302-
go-version: "^1.17"
302+
go-version: "~1.17"
303303

304304
- name: Echo Go Cache Paths
305305
id: go-cache-paths
@@ -361,7 +361,7 @@ jobs:
361361
# Go is required for uploading the test results to datadog
362362
- uses: actions/setup-go@v2
363363
with:
364-
go-version: "^1.17"
364+
go-version: "~1.17"
365365

366366
- uses: actions/setup-node@v3
367367
with:
@@ -425,7 +425,7 @@ jobs:
425425
# Go is required for uploading the test results to datadog
426426
- uses: actions/setup-go@v2
427427
with:
428-
go-version: "^1.17"
428+
go-version: "~1.17"
429429

430430
- uses: hashicorp/setup-terraform@v1
431431
with:

cli/start.go

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/briandowns/spinner"
1616
"github.com/coreos/go-systemd/daemon"
1717
"github.com/spf13/cobra"
18-
"github.com/spf13/pflag"
1918
"golang.org/x/xerrors"
2019
"google.golang.org/api/idtoken"
2120
"google.golang.org/api/option"
@@ -247,7 +246,7 @@ func start() *cobra.Command {
247246
},
248247
})
249248
if err != nil {
250-
return err
249+
return xerrors.Errorf("delete workspace %s: %w", workspace.Name, err)
251250
}
252251
}
253252
}
@@ -287,12 +286,6 @@ func start() *cobra.Command {
287286
root.Flags().BoolVarP(&useTunnel, "tunnel", "", true, "Serve dev mode through a Cloudflare Tunnel for easy setup.")
288287
_ = root.Flags().MarkHidden("tunnel")
289288

290-
if os.Getenv("DUMP") != "" {
291-
root.Flags().VisitAll(func(flag *pflag.Flag) {
292-
fmt.Printf("%s %s\n", flag.Name, flag.Usage)
293-
})
294-
}
295-
296289
return root
297290
}
298291

@@ -304,7 +297,7 @@ func createFirstUser(cmd *cobra.Command, client *codersdk.Client, cfg config.Roo
304297
Organization: "acme-corp",
305298
})
306299
if err != nil {
307-
return xerrors.Errorf("create first user: %w\n", err)
300+
return xerrors.Errorf("create first user: %w", err)
308301
}
309302
token, err := client.LoginWithPassword(cmd.Context(), codersdk.LoginWithPasswordRequest{
310303
Email: "admin@coder.com",

0 commit comments

Comments
 (0)