Respond to review comments

coder · ammario · Jun 12, 2023 · Jun 10, 2023 · Jun 10, 2023 · Jun 10, 2023
commit 39c1fe5d26975f6fe801e241929c23eb6f745f3a
diff --git a/.github/actions/setup-go/action.yaml b/.github/actions/setup-go/action.yaml
@@ -49,6 +49,9 @@ runs:
           ${{ env.GOCACHE }}
         # Job name must be included in the key for effective
         # test cache reuse.
+        # The key format is intentionally different than GOMODCACHE, because any
+        # time a Go file changes we invalidate this cache, whereas GOMODCACHE
+        # is only invalidated when go.sum changes.
         key: gocache-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/*.go', 'go.**') }}
         restore-keys: |
           gocache-${{ runner.os }}-${{ github.job }}-

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -104,7 +104,7 @@ jobs:
 
       - name: Get golangci-lint cache dir
         run: |
-	        go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.2
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.2
           dir=$(golangci-lint cache status | awk '/Dir/ { print $2 }')
           echo "LINT_CACHE_DIR=$dir" >> $GITHUB_ENV
 
@@ -555,6 +555,8 @@ jobs:
       - 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/enterprise/cli/root_internal_test.go b/enterprise/cli/root_internal_test.go
@@ -6,9 +6,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/cli"
-
 	"github.com/coder/coder/cli/clibase"
-
 	"github.com/coder/coder/cli/clitest"
 )