Merge branch 'main' into mafredri/fix-coderd-metadata-test

mafredri · web-flow · commit 76a17d72bb25 · 2023-06-12T20:01:17.000+03:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -565,14 +565,16 @@ jobs:
 
   required:
     runs-on: ubuntu-latest
-    needs: [gen, test-go, test-go-pg, test-go-race, test-js]
+    needs: [fmt, lint, gen, test-go, test-go-pg, test-go-race, test-js]
     # Allow this job to run even if the needed jobs fail, are skipped or
     # cancelled.
     if: always()
     steps:
       - name: Ensure required checks
         run: |
           echo "Checking required checks"
+          echo "- fmt: ${{ needs.fmt.result }}"
+          echo "- lint: ${{ needs.lint.result }}"
           echo "- gen: ${{ needs.gen.result }}"
           echo "- test-go: ${{ needs.test-go.result }}"
           echo "- test-go-pg: ${{ needs.test-go-pg.result }}"
diff --git a/cli/ssh.go b/cli/ssh.go
@@ -110,7 +110,7 @@ func (r *RootCmd) ssh() *clibase.Cmd {
 				}
 				go func() {
 					wg.Wait()
-					logFile.Close()
+					_ = logFile.Close()
 				}()
 
 				logger = slog.Make(sloghuman.Sink(logFile))

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ func (r RootCmd) ssh() clibase.Cmd {`
`110`	`110`	`}`
`111`	`111`	`go func() {`
`112`	`112`	`wg.Wait()`
`113`		`- logFile.Close()`
	`113`	`+ _ = logFile.Close()`
`114`	`114`	`}()`
`115`	`115`
`116`	`116`	`logger = slog.Make(sloghuman.Sink(logFile))`