From 7b512255e0e754b23e9941196c07af98f632b7a9 Mon Sep 17 00:00:00 2001 From: Ethan Dickson Date: Thu, 17 Oct 2024 05:12:01 +0000 Subject: [PATCH] fix: check unstaged files during ci lint --- .github/workflows/ci.yaml | 6 ++++++ coderd/activitybump_test.go | 2 +- enterprise/wsproxy/keyfetcher.go | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b8be3b7c54bd3..9494a4d4d9c80 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -223,6 +223,12 @@ jobs: ./actionlint -color -shellcheck= -ignore "set-output" shell: bash + - name: Check for unstaged files + run: | + rm -f ./actionlint ./typos + ./scripts/check_unstaged.sh + shell: bash + gen: timeout-minutes: 8 runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }} diff --git a/coderd/activitybump_test.go b/coderd/activitybump_test.go index 2f4413dff9fee..60aec23475885 100644 --- a/coderd/activitybump_test.go +++ b/coderd/activitybump_test.go @@ -125,7 +125,7 @@ func TestWorkspaceActivityBump(t *testing.T) { } // maxTimeDrift is how long we are willing wait for a deadline to - // be increased. Since it could have been bumped at the intial + // be increased. Since it could have been bumped at the initial maxTimeDrift := testutil.WaitMedium updatedAfter := dbtime.Now() diff --git a/enterprise/wsproxy/keyfetcher.go b/enterprise/wsproxy/keyfetcher.go index 81b71301b610f..f30fffb2cd093 100644 --- a/enterprise/wsproxy/keyfetcher.go +++ b/enterprise/wsproxy/keyfetcher.go @@ -3,10 +3,11 @@ package wsproxy import ( "context" + "golang.org/x/xerrors" + "github.com/coder/coder/v2/coderd/cryptokeys" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/enterprise/wsproxy/wsproxysdk" - "golang.org/x/xerrors" ) var _ cryptokeys.Fetcher = &ProxyFetcher{}