idk man

aslilac · aslilac · commit ad8d7c7cfe2a · 2023-10-17T16:52:53.000Z
diff --git a/.github/actions/setup-sqlc/action.yaml b/.github/actions/setup-sqlc/action.yaml
@@ -5,6 +5,6 @@ runs:
   using: "composite"
   steps:
     - name: Setup sqlc
-      uses: sqlc-dev/setup-sqlc@v3
+      uses: sqlc-dev/setup-sqlc@v4
       with:
         sqlc-version: "1.20.0"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -174,9 +174,15 @@ jobs:
       - name: Setup Go
         uses: ./.github/actions/setup-go
 
+      - name: Check for unstaged files
+        run: ./scripts/check_unstaged.sh
+
       - name: Setup sqlc
         uses: ./.github/actions/setup-sqlc
 
+      - name: Check for unstaged files
+        run: ./scripts/check_unstaged.sh
+
       - name: go install tools
         run: |
           go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30
@@ -185,6 +191,9 @@ jobs:
           go install github.com/mikefarah/yq/v4@v4.30.6
           go install github.com/golang/mock/mockgen@v1.6.0
 
+      - name: Check for unstaged files
+        run: ./scripts/check_unstaged.sh
+
       - name: Install Protoc
         run: |
           mkdir -p /tmp/proto
@@ -195,6 +204,9 @@ jobs:
           cp -r ./include /usr/local/bin/include
           popd
 
+      - name: Check for unstaged files
+        run: ./scripts/check_unstaged.sh
+
       - name: make gen
         run: "make --output-sync -j -B gen"
 
diff --git a/Makefile b/Makefile
@@ -540,9 +540,9 @@ provisionerd/proto/provisionerd.pb.go: provisionerd/proto/provisionerd.proto
 		./provisionerd/proto/provisionerd.proto
 
 site/src/api/typesGenerated.ts: scripts/apitypings/main.go $(shell find ./codersdk $(FIND_EXCLUSIONS) -type f -name '*.go')
-	go run ./scripts/apitypings/ > site/src/api/typesGenerated.ts
+	go run ./scripts/apitypings/ > $@
 	cd site
-	pnpm run format:types ./src/api/typesGenerated.ts
+	pnpm run format:write:only "$@"
 
 site/e2e/provisionerGenerated.ts: provisionerd/proto/provisionerd.pb.go provisionersdk/proto/provisioner.pb.go
 	cd site
@@ -551,7 +551,7 @@ site/e2e/provisionerGenerated.ts: provisionerd/proto/provisionerd.pb.go provisio
 
 site/src/theme/icons.json: $(wildcard site/static/icon/*)
 	go run ./scripts/gensite/ -icons $@
-	pnpm run format:write:only $@
+	pnpm run format:write:only "$@"
 
 examples/examples.gen.json: scripts/examplegen/main.go examples/examples.go $(shell find ./examples/templates)
 	go run ./scripts/examplegen/main.go > examples/examples.gen.json
diff --git a/site/package.json b/site/package.json
@@ -11,9 +11,8 @@
     "chromatic": "chromatic",
     "dev": "vite",
     "format:check": "pnpm exec prettier --cache --check '../**/*.{css,html,js,json,jsx,md,ts,tsx,yaml,yml}'",
-    "format:types": "pnpm exec prettier --cache --write './src/api/typesGenerated.ts'",
     "format:write": "pnpm exec prettier --cache --write '../**/*.{css,html,js,json,jsx,md,ts,tsx,yaml,yml}'",
-    "format:write:only": "pnpm exec prettier --write",
+    "format:write:only": "pnpm exec prettier --cache --write",
     "lint": "pnpm typegen && pnpm run lint:types && pnpm exec jest --selectProjects lint",
     "lint:fix": "FIX=true pnpm lint",
     "lint:types": "tsc --noEmit",
